diff --git a/.agents/skills/apm-integrations/references/advice-class.md b/.agents/skills/apm-integrations/references/advice-class.md index ad140b8d94e..876e55e823e 100644 --- a/.agents/skills/apm-integrations/references/advice-class.md +++ b/.agents/skills/apm-integrations/references/advice-class.md @@ -23,7 +23,7 @@ Enter method: 1. `AgentSpan span = startSpan(DECORATE.operationName(), ...)` 2. `DECORATE.afterStart(span)` + set domain-specific tags -3. `AgentScope scope = activateSpan(span)` — return or store via `@Advice.Local` +3. `ContextScope scope = activateSpan(span)` — return or store via `@Advice.Local` Exit method: 4. `DECORATE.onError(span, throwable)` — only if throwable is non-null @@ -39,10 +39,10 @@ The `onThrowable = Throwable.class` attribute on `@Advice.OnMethodExit` controls // Standard pattern — exit fires whether the target method returned or threw @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable thrown) { if (scope != null) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, thrown); DECORATE.beforeFinish(span); scope.close(); @@ -147,7 +147,7 @@ if (span != null && routeMatch != null) { } ``` -For route-only enrichers: no `AgentScope`, no `startSpan()`, no `decorator.afterStart()`. This rule does NOT apply to standalone HTTP clients (which own their own span identity) or to handler-owning frameworks like JAX-RS / Ratpack (which legitimately create controller spans). +For route-only enrichers: no `ContextScope`, no `startSpan()`, no `decorator.afterStart()`. This rule does NOT apply to standalone HTTP clients (which own their own span identity) or to handler-owning frameworks like JAX-RS / Ratpack (which legitimately create controller spans). ### Advice classes must not declare non-constant static fields diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 9c219453ee9..d61754b6290 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -256,15 +256,14 @@ /dd-trace-api/**/config/AppSecConfig* @DataDog/asm-java **/*Rasp* @DataDog/asm-java **/*Waf* @DataDog/asm-java -/dd-java-agent/instrumentation/**/appsec/ @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/**/*CallSite* @DataDog/asm-java @DataDog/apm-idm-java -/dd-java-agent/instrumentation/**/iast/ @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*appsec* @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*AppSec* @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*iast* @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*rasp* @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/**/*Iast* @DataDog/asm-java @DataDog/apm-idm-java -/dd-java-agent/instrumentation/**/rasp/ @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/**/*Rasp* @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/**/*Waf* @DataDog/asm-java @DataDog/apm-idm-java -/dd-java-agent/instrumentation/*iast* @DataDog/asm-java @DataDog/apm-idm-java -/dd-java-agent/instrumentation/*appsec* @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/beanshell-2.0/ @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/commons-fileupload-1.5/ @DataDog/asm-java @DataDog/apm-idm-java /dd-java-agent/instrumentation/datadog/asm/ @DataDog/asm-java @DataDog/apm-idm-java diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0e26911aa0b..bf87d739e1d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -5,7 +5,7 @@ include: - local: ".gitlab/ci-visibility-tests.yml" - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-spring-petclinic-parallel.yml' - ref: &apm_sdks_benchmarks_sha '0899730be7696774b222937adfc6583932c050e1' # pinned by "Update apm-sdks-benchmarks reference" workflow + ref: &apm_sdks_benchmarks_sha '5e416ea523f39bbdf9e44f39e6895a07d3715ff5' # pinned by .github/workflows/update-apm-sdks-benchmarks-reference.yaml - project: 'DataDog/apm-reliability/apm-sdks-benchmarks' file: '.gitlab/ci-java-load-parallel.yml' ref: *apm_sdks_benchmarks_sha @@ -47,8 +47,8 @@ stages: variables: APM_SDKS_BENCHMARKS_SHA: *apm_sdks_benchmarks_sha # Test the OpenTelemetry Operator-compatible Java image jobs from one-pipeline. - OTEL_OPERATOR_IMAGES_ENABLED: "true" - OTEL_OPERATOR_LANGUAGE: java + CI_OTEL_OPERATOR_IMAGES_ENABLED: "true" + CI_OTEL_OPERATOR_LANGUAGE: java # Gitlab runner features; see https://docs.gitlab.com/runner/configuration/feature-flags.html # Fold and time all script sections FF_SCRIPT_SECTIONS: 1 diff --git a/.gitlab/exploration-tests.yml b/.gitlab/exploration-tests.yml index 92fb751a982..be3a36c384d 100644 --- a/.gitlab/exploration-tests.yml +++ b/.gitlab/exploration-tests.yml @@ -50,6 +50,7 @@ build-exploration-tests-image: tags: [ "arch:amd64"] image: $EXPLORATION_TESTS_IMAGE artifacts: + when: always paths: - "*_agent.log.gz" - "*_surefire-reports.tar.gz" @@ -128,3 +129,18 @@ exploration-tests-method-okhttp: - sdk use java 17.0.10-tem - java -XshowSettings:system -version - ./run-exploration-tests.sh "method" "$PROJECT" "GRADLE_OPTS=-XX:ActiveProcessorCount=4 ./gradlew --max-workers 4 jvmTest -Dtest.java.version=11" "include_${PROJECT}.txt" "exclude_$PROJECT.txt" + after_script: + - cp /exploration-tests/${PROJECT}/agent.log ${PROJECT}_agent.log || true + - gzip ${PROJECT}_agent.log || true + - tar czf ${PROJECT}_debugger-dumps.tar.gz /tmp/debugger || true + - mkdir -p ${PROJECT}-test-results + - (cd /exploration-tests/${PROJECT} && find . -path "*/build/test-results/*/TEST-*.xml" -exec cp --parents {} $CI_PROJECT_DIR/${PROJECT}-test-results/ \;) || true + artifacts: + when: always + paths: + - "*_agent.log.gz" + - "*_debugger-dumps.tar.gz" + - "${PROJECT}-test-results/" + reports: + junit: + - "${PROJECT}-test-results/**/TEST-*.xml" diff --git a/.gitlab/one-pipeline.locked.yml b/.gitlab/one-pipeline.locked.yml index e841e064e90..ecbd1a1511e 100644 --- a/.gitlab/one-pipeline.locked.yml +++ b/.gitlab/one-pipeline.locked.yml @@ -1,4 +1,4 @@ # DO NOT EDIT THIS FILE MANUALLY # This file is auto-generated by automation. include: - - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.5.1/one-pipeline.yml + - remote: https://gitlab-templates.ddbuild.io/libdatadog/include/versions/1.5.3/one-pipeline.yml diff --git a/.gitlab/upload_ciapp.sh b/.gitlab/upload_ciapp.sh index e918ed16593..a38ca3323eb 100755 --- a/.gitlab/upload_ciapp.sh +++ b/.gitlab/upload_ciapp.sh @@ -78,9 +78,16 @@ junit_upload() { custom_tags_args+=(--tags "test.configuration.job_name:${job_base_name}") fi - DD_API_KEY=$1 \ + # The commit message must contain the exact, case-sensitive token [ci: DEBUG_LOGS]. + if [[ "${CI_COMMIT_MESSAGE:-}" == *"[ci: DEBUG_LOGS]"* ]]; then + DD_CIVISIBILITY_LOGS_ENABLED=true + fi + if [[ "${DD_CIVISIBILITY_LOGS_ENABLED:-false}" == "true" ]]; then + echo "Datadog JUnit log forwarding is enabled" + fi + + DD_API_KEY=$1 DD_CIVISIBILITY_LOGS_ENABLED=${DD_CIVISIBILITY_LOGS_ENABLED:-false} \ datadog-ci junit upload --service $SERVICE_NAME \ - --logs \ --tags "test.traits:{\"category\":[\"$CACHE_TYPE\"]}" \ --tags "git.repository_url:https://github.com/DataDog/dd-trace-java" \ "${custom_tags_args[@]}" \ diff --git a/ARCHITECTURE.md b/ARCHITECTURE.md index ce12897532f..1b67fae9ceb 100644 --- a/ARCHITECTURE.md +++ b/ARCHITECTURE.md @@ -157,7 +157,8 @@ Core tracing abstractions: - `AgentTracer` — Static tracer facade. Instrumentations call `AgentTracer.startSpan()`, `AgentTracer.activateSpan()`, etc. -- `AgentSpan` / `AgentScope` / `AgentSpanContext` — Internal span/scope/context interfaces. +- `AgentSpan` / `AgentSpanContext` — Internal span/context interfaces. Scopes use the tracer-agnostic + `ContextScope` (`components/context`); `AgentSpan.fromScope(scope)` extracts the active span from one. - `AgentPropagation` — Context propagation interfaces (`Getter`, `Setter`) that instrumentations implement to inject/extract trace context from framework-specific carriers (HTTP headers, message properties, etc.). diff --git a/build-logic/smoke-test/src/main/resources/datadog/buildlogic/smoketest/proxy-repositories.init.gradle.kts b/build-logic/smoke-test/src/main/resources/datadog/buildlogic/smoketest/proxy-repositories.init.gradle.kts index 70fe8054b90..53d998e203c 100644 --- a/build-logic/smoke-test/src/main/resources/datadog/buildlogic/smoketest/proxy-repositories.init.gradle.kts +++ b/build-logic/smoke-test/src/main/resources/datadog/buildlogic/smoketest/proxy-repositories.init.gradle.kts @@ -1,41 +1,96 @@ import org.gradle.api.Action import org.gradle.api.Project +import org.gradle.api.artifacts.dsl.RepositoryHandler +import org.gradle.api.artifacts.repositories.MavenArtifactRepository import org.gradle.api.initialization.Settings +import java.net.URI gradle.beforeSettings(Action { val gradlePluginProxy = providers.gradleProperty("gradlePluginProxy").orNull val mavenRepositoryProxy = providers.gradleProperty("mavenRepositoryProxy").orNull + val mavenCentralUrls = setOf( + "https://repo.maven.apache.org/maven2", + "https://repo1.maven.org/maven2", + ) + // Marks the proxy repository this script injects, so the deduplication below can tell it apart + // from a redirected mavenCentral() the nested build declared itself. + val injectedProxyName = "ddSmokeTestMavenRepositoryProxy" + + fun RepositoryHandler.redirectMavenCentral() { + val proxy = mavenRepositoryProxy?.takeIf { it.isNotBlank() } ?: return + withType(MavenArtifactRepository::class.java).configureEach { + // A repository declared without a URL has a null one until Gradle validates it; leave it be + // so the nested build reports that itself instead of failing inside this init script. + val repositoryUrl = url?.toString()?.trimEnd('/') + if (repositoryUrl != null && repositoryUrl in mavenCentralUrls) { + url = URI(proxy) + isAllowInsecureProtocol = true + } + } + } + + fun RepositoryHandler.removeDuplicateMavenProxy() { + val proxyUrl = mavenRepositoryProxy?.takeIf { it.isNotBlank() }?.trimEnd('/') ?: return + val proxies = withType(MavenArtifactRepository::class.java) + .filter { it.url?.toString()?.trimEnd('/') == proxyUrl } + // Keep the injected repository: it is the only one known to be unrestricted, since a declared + // mavenCentral() may carry content filters that redirectMavenCentral() does not lift. + if (proxies.none { it.name == injectedProxyName }) { + return + } + proxies.filter { it.name != injectedProxyName }.forEach { remove(it) } + } + + buildscript.repositories.redirectMavenCentral() + pluginManagement.repositories.redirectMavenCentral() + dependencyResolutionManagement.repositories.redirectMavenCentral() pluginManagement { repositories { mavenLocal() gradlePluginProxy?.takeIf { it.isNotBlank() }?.let { proxy -> maven { - url = java.net.URI(proxy) + url = URI(proxy) isAllowInsecureProtocol = true } } mavenRepositoryProxy?.takeIf { it.isNotBlank() }?.let { proxy -> maven { - url = java.net.URI(proxy) + name = injectedProxyName + url = URI(proxy) isAllowInsecureProtocol = true } } gradlePluginPortal() - mavenCentral() + if (mavenRepositoryProxy.isNullOrBlank()) { + mavenCentral() + } } } + gradle.settingsEvaluated(Action { + pluginManagement.repositories.removeDuplicateMavenProxy() + }) + gradle.beforeProject(Action { + repositories.redirectMavenCentral() + buildscript.repositories.redirectMavenCentral() repositories { mavenLocal() mavenRepositoryProxy?.takeIf { it.isNotBlank() }?.let { proxy -> maven { - url = java.net.URI(proxy) + name = injectedProxyName + url = URI(proxy) isAllowInsecureProtocol = true } } - mavenCentral() + if (mavenRepositoryProxy.isNullOrBlank()) { + mavenCentral() + } } }) + + gradle.afterProject(Action { + repositories.removeDuplicateMavenProxy() + }) }) 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 6aa17ed4b7c..656fbeedd49 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 @@ -265,7 +265,7 @@ class SmokeTestAppEndToEndTest { } @Test - fun `local proxy property prepends Maven proxy repositories exactly once`() { + fun `Maven proxy replaces Maven Central in nested repositories`() { writeOuterSettings() val proxyRepository = projectDir.resolve("proxy-maven-repo").toFile() val projectRepository = projectDir.resolve("project-maven-repo").toFile() @@ -279,10 +279,37 @@ class SmokeTestAppEndToEndTest { sysProperty = "resolved.repositories.path", ), ) - writeInnerSettings() + writeInnerSettings( + """ + pluginManagement { + repositories { + mavenCentral() + } + } + + gradle.settingsEvaluated { + val outputDir = java.io.File(providers.gradleProperty("appBuildDir").get()) + outputDir.mkdirs() + outputDir.resolve("plugin-repositories.txt").writeText( + pluginManagement.repositories + .withType(org.gradle.api.artifacts.repositories.MavenArtifactRepository::class.java) + .joinToString(System.lineSeparator()) { "repository=" + it.url } + ) + } + + gradle.projectsLoaded { + gradle.rootProject.repositories.mavenCentral { + content { + includeGroup("com.unrelated") + } + } + } + """.trimIndent(), + ) writeInnerBuild( """ repositories { + mavenCentral() maven { url = uri("${projectRepository.toURI()}") } @@ -301,8 +328,12 @@ class SmokeTestAppEndToEndTest { val artifacts = configurations.compileClasspath.get() .sortedBy { it.name } .map { it.name + "=" + it.readText() } + val repositoryUrls = repositories + .withType(org.gradle.api.artifacts.repositories.MavenArtifactRepository::class.java) + .map { "repository=" + it.url } resolved.get().asFile.writeText( - (listOf("init-script-count=" + gradle.startParameter.initScripts.size) + artifacts) + (listOf("init-script-count=" + gradle.startParameter.initScripts.size) + + repositoryUrls + artifacts) .joinToString(System.lineSeparator()) ) } @@ -319,11 +350,31 @@ class SmokeTestAppEndToEndTest { assertThat(result.task(":resolveRepositories")?.outcome).isEqualTo(TaskOutcome.SUCCESS) val resolvedFile = applicationOutput("resolved-repositories.txt") assertThat(resolvedFile).exists() - assertThat(resolvedFile.readLines()).containsExactly( + val resolvedLines = resolvedFile.readLines() + assertThat(resolvedLines).contains( "init-script-count=1", + "repository=${proxyRepository.toURI()}", "project-only-1.0.jar=project-only", "shared-1.0.jar=proxy", ) + assertThat(resolvedLines).containsOnlyOnce( + "repository=${proxyRepository.toURI()}", + ) + assertThat(resolvedLines).doesNotContain( + "repository=https://repo.maven.apache.org/maven2/", + ) + val pluginRepositoriesFile = applicationOutput("plugin-repositories.txt") + assertThat(pluginRepositoriesFile).exists() + val pluginRepositoryLines = pluginRepositoriesFile.readLines() + assertThat(pluginRepositoryLines).contains( + "repository=${proxyRepository.toURI()}", + ) + assertThat(pluginRepositoryLines).containsOnlyOnce( + "repository=${proxyRepository.toURI()}", + ) + assertThat(pluginRepositoryLines).doesNotContain( + "repository=https://repo.maven.apache.org/maven2/", + ) } @Test @@ -649,10 +700,11 @@ class SmokeTestAppEndToEndTest { "fake-mvnw" } - private fun writeInnerSettings() { + private fun writeInnerSettings(additionalContent: String = "") { File(applicationDir, "settings.gradle.kts").writeText( """ rootProject.name = "smoke-test-app-fixture-application" + $additionalContent """.trimIndent(), ) } diff --git a/build.gradle.kts b/build.gradle.kts index 0bb5a4caee6..5f07b849668 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -6,19 +6,19 @@ import datadog.gradle.plugin.ci.testAggregate plugins { kotlin("jvm") version libs.versions.kotlin.plugin apply false - id("dd-trace-java.gradle-debug") + id("dd-trace-java.ci-jobs") + id("dd-trace-java.config-inversion-linter") id("dd-trace-java.dependency-locking") - id("dd-trace-java.tracer-version") id("dd-trace-java.dump-hanged-test") - id("dd-trace-java.config-inversion-linter") - id("dd-trace-java.ci-jobs") + id("dd-trace-java.gradle-debug") + id("dd-trace-java.tracer-version") + alias(libs.plugins.shadow) apply false alias(libs.plugins.spotless) - id("me.champeau.gradle.japicmp") version "0.4.3" - id("com.github.spotbugs") version "6.5.10" + id("com.github.spotbugs") version "6.5.11" id("de.thetaphi.forbiddenapis") version "3.10" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - alias(libs.plugins.shadow) apply false + id("me.champeau.gradle.japicmp") version "0.4.3" id("me.champeau.jmh") version "0.7.3" apply false id("org.gradle.playframework") version "0.16.0" apply false } diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt index 418f0e2b3e0..44a92c16d46 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/config/ConfigInversionLinter.kt @@ -89,7 +89,7 @@ private fun registerLogEnvVarUsages(target: Project, extension: SupportedTracerC val javaFiles = target.fileTree(target.projectDir) { include("**/src/main/java/**/*.java") exclude("**/build/**", "**/dd-smoke-tests/**") - // Undertow uses DD_UNDERTOW_CONTINUATION as a legacy key to store an AgentScope. It is not related to an environment variable + // Undertow uses DD_UNDERTOW_CONTINUATION as a legacy key to store a ContextContinuation. It is not related to an environment variable exclude("dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java") } inputs.files(javaFiles) diff --git a/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtils.kt b/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtils.kt index a35d00f6c63..c5bb333da6f 100644 --- a/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtils.kt +++ b/buildSrc/src/main/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtils.kt @@ -155,17 +155,21 @@ internal object MuzzleMavenRepoUtils { var attemptCount = 0 var range: VersionRangeResult? = null var failure: VersionRangeResolutionException? = null + val resultExceptions = mutableListOf>>() fun attemptResolve(): VersionRangeResult? { attemptCount++ - return try { - range = system.resolveVersionRange(session, rangeRequest) + val result = try { failure = null - range?.takeIf { it.hasBounds() } + system.resolveVersionRange(session, rangeRequest) } catch (e: VersionRangeResolutionException) { failure = e - range = e.result ?: range - null + e.result ?: return null } + range = result + if (result.exceptions.isNotEmpty()) { + resultExceptions += attemptCount to result.exceptions.toList() + } + return result.takeIf { failure == null && it.hasBounds() } } repeat(4) { @@ -195,6 +199,7 @@ internal object MuzzleMavenRepoUtils { rangeRequest.repositories, range, failure, + resultExceptions, attemptCount, waitedSeconds, enableBackoffRetries @@ -275,6 +280,7 @@ internal object MuzzleMavenRepoUtils { repositories: List, range: VersionRangeResult?, failure: VersionRangeResolutionException?, + resultExceptions: List>>, attemptCount: Int, waitedSeconds: Long, enableBackoffRetries: Boolean @@ -303,6 +309,15 @@ internal object MuzzleMavenRepoUtils { appendLine(" highestVersion=${range.highestVersion ?: ""}") appendLine(" versionCount=${range.versions.size}") } + if (resultExceptions.isNotEmpty()) { + appendLine("Resolution result exceptions:") + resultExceptions.forEach { (attempt, exceptions) -> + appendLine(" Attempt $attempt:") + exceptions.forEach { exception -> + appendException(exception, " ") + } + } + } if (failure != null) { appendLine("Last resolution failure:") appendLine(" ${failure.javaClass.name}: ${failure.message ?: ""}") @@ -313,6 +328,20 @@ internal object MuzzleMavenRepoUtils { }.trimEnd() } + private fun StringBuilder.appendException(exception: Throwable, indent: String) { + var current: Throwable? = exception + var currentIndent = indent + var depth = 0 + while (current != null && depth < 10) { + val prefix = if (depth == 0) "" else "Caused by: " + appendLine("$currentIndent$prefix${current.javaClass.name}: ${current.message ?: ""}") + val cause = current.cause + current = cause?.takeUnless { it === current } + currentIndent += " " + depth++ + } + } + private fun artifactCoordinates(artifact: Artifact): String { val classifier = artifact.classifier?.takeUnless { it.isEmpty() } return listOfNotNull( diff --git a/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtilsTest.kt b/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtilsTest.kt index 682b8e29f49..e6983e45b15 100644 --- a/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtilsTest.kt +++ b/buildSrc/src/test/kotlin/datadog/gradle/plugin/muzzle/MuzzleMavenRepoUtilsTest.kt @@ -17,6 +17,7 @@ import org.junit.jupiter.api.io.TempDir import org.junit.jupiter.params.ParameterizedTest import org.junit.jupiter.params.provider.CsvSource import java.io.File +import java.io.IOException import java.lang.reflect.Proxy import java.util.concurrent.atomic.AtomicInteger import org.assertj.core.api.Assertions.assertThat @@ -71,7 +72,7 @@ class MuzzleMavenRepoUtilsTest { versions = "[1.0,)" } val attempts = AtomicInteger() - val retryingSystem = repositorySystemThrowingThenResolving( + val retryingSystem = repositorySystemReturningAfterFailures( failuresBeforeSuccess = 3, result = createVersionRangeResult("1.0.0"), attempts = attempts @@ -149,7 +150,7 @@ class MuzzleMavenRepoUtilsTest { versions = "[1.0,)" } val attempts = AtomicInteger() - val throwingSystem = repositorySystemThrowingThenResolving( + val throwingSystem = repositorySystemReturningAfterFailures( failuresBeforeSuccess = 4, result = createVersionRangeResult("1.0.0"), attempts = attempts @@ -171,6 +172,41 @@ class MuzzleMavenRepoUtilsTest { assertThat(attempts).hasValue(4) } + @Test + fun `resolveVersionRange failure includes embedded result exceptions from every attempt`() { + val directive = MuzzleDirective().apply { + group = "com.example" + module = "mylib" + versions = "[1.0,)" + } + val attempts = AtomicInteger() + val emptyResult = createVersionRangeResult().apply { + addException( + IllegalStateException( + "metadata failure", + IOException() + ) + ) + } + val failingSystem = repositorySystemReturningAfterFailures(0, emptyResult, attempts) + + assertThatThrownBy { + MuzzleMavenRepoUtils.resolveVersionRange( + directive, + failingSystem, + newSession(), + emptyList(), + enableBackoffRetries = false + ) + }.isInstanceOf(IllegalStateException::class.java) + .hasMessageContaining("Resolution result exceptions:") + .hasMessageContaining("Attempt 1:") + .hasMessageContaining("Attempt 4:") + .hasMessageContaining("java.lang.IllegalStateException: metadata failure") + .hasMessageContaining("Caused by: java.io.IOException: ") + assertThat(attempts).hasValue(4) + } + @Test fun `resolveVersionRange includes directive extra repositories`() { val repoA = publishAndGetRepo("com.example", "mylib", listOf("1.0.0", "2.0.0"), subDir = "repoA") @@ -328,7 +364,7 @@ class MuzzleMavenRepoUtilsTest { return VersionRangeResult(request).apply { this.versions = versions } } - private fun repositorySystemThrowingThenResolving( + private fun repositorySystemReturningAfterFailures( failuresBeforeSuccess: Int, result: VersionRangeResult, attempts: AtomicInteger @@ -349,8 +385,9 @@ class MuzzleMavenRepoUtilsTest { } result } - "toString" -> "repositorySystemThrowingThenResolving" + "toString" -> "repositorySystemReturningAfterFailures" else -> throw UnsupportedOperationException(method.name) } } as RepositorySystem + } diff --git a/communication/gradle.lockfile b/communication/gradle.lockfile index f46c4220ded..84f48de724d 100644 --- a/communication/gradle.lockfile +++ b/communication/gradle.lockfile @@ -8,6 +8,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -23,8 +24,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -78,7 +79,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.8.20=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.8.20=testCompileClasspath,testRuntimeClasspath diff --git a/communication/src/main/java/datadog/communication/serialization/EncodingCache.java b/communication/src/main/java/datadog/communication/serialization/EncodingCache.java index 4833eb8695a..d0b6bc086b3 100644 --- a/communication/src/main/java/datadog/communication/serialization/EncodingCache.java +++ b/communication/src/main/java/datadog/communication/serialization/EncodingCache.java @@ -1,6 +1,13 @@ package datadog.communication.serialization; +import datadog.trace.api.function.BackgroundOnly; + // TODO @FunctionalInterface +/** + * {@link BackgroundOnly}: every implementation ({@link SimpleUtf8Cache}, {@link + * GenerationalUtf8Cache}) is only safe to call from the writer/serializer thread that owns it. + */ +@BackgroundOnly public interface EncodingCache { byte[] encode(CharSequence s); diff --git a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java index 099ff56e0e0..d0911907116 100644 --- a/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/GenerationalUtf8Cache.java @@ -1,5 +1,6 @@ package datadog.communication.serialization; +import datadog.trace.api.function.BackgroundOnly; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import java.nio.charset.StandardCharsets; import javax.annotation.concurrent.ThreadSafe; @@ -15,6 +16,11 @@ * String#getBytes(java.nio.charset.Charset)}. * *

The cache is thread safe. + * + *

{@link BackgroundOnly}: the eden/tenured promotion and recalibration bookkeeping costs more + * than the {@code getBytes} call it replaces, so the saving only shows up as reduced allocation/GC + * pressure on the thread that pays it -- confine it to the background serializer thread, not an + * application thread. */ /* * Cache works by using a 2-level promotion based scheme. @@ -64,6 +70,7 @@ * provide better cache utilization. */ @ThreadSafe +@BackgroundOnly @SuppressFBWarnings( value = "IS2_INCONSISTENT_SYNC", justification = diff --git a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java index 8eb12d48465..2398c4d4e05 100644 --- a/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java +++ b/communication/src/main/java/datadog/communication/serialization/SimpleUtf8Cache.java @@ -1,5 +1,6 @@ package datadog.communication.serialization; +import datadog.trace.api.function.BackgroundOnly; import java.nio.charset.StandardCharsets; import javax.annotation.concurrent.ThreadSafe; @@ -13,6 +14,11 @@ * String#getBytes(java.nio.charset.Charset)}. * *

The cache is thread safe. + * + *

{@link BackgroundOnly}: the bookkeeping (hit counting, LFU eviction scan) costs more than the + * {@code getBytes} call it replaces, so the saving only shows up as reduced allocation/GC pressure + * on the thread that pays it -- confine it to the background serializer thread, not an application + * thread. */ /* * Thread safety is achieved through using CacheEntry objects where the key data @@ -43,6 +49,7 @@ * a LFU: least frequently used eviction policy is used to free up a slot. */ @ThreadSafe +@BackgroundOnly public final class SimpleUtf8Cache implements EncodingCache { static final int MAX_CAPACITY = 1024; diff --git a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java index e8876b86df3..55669be9afa 100644 --- a/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java +++ b/communication/src/main/java/datadog/communication/serialization/custom/aiguard/MessageWriter.java @@ -13,12 +13,14 @@ public class MessageWriter implements ValueWriter { public void write( final AIGuard.Message value, final Writable writable, final EncodingCache encodingCache) { final int[] size = {0}; - final boolean hasRole = isNotBlank(value.getRole(), size); - final boolean hasToolCallId = isNotBlank(value.getToolCallId(), size); - final boolean hasToolCalls = isNotEmpty(value.getToolCalls(), size); + final boolean hasRole = present(Strings.isNotBlank(value.getRole()), size); + final boolean hasToolCallId = present(Strings.isNotBlank(value.getToolCallId()), size); + final boolean hasToolCalls = present(isNotEmpty(value.getToolCalls()), size); - final boolean hasContentParts = isNotEmpty(value.getContentParts(), size); - final boolean hasContentString = !hasContentParts && isNotBlank(value.getContent(), size); + final boolean hasContentParts = present(isNotEmpty(value.getContentParts()), size); + // An empty content string is still written: "" is what the redaction remove strategy leaves + // behind, and dropping it would be indistinguishable from a message that never had content. + final boolean hasContentString = present(!hasContentParts && value.getContent() != null, size); writable.startMap(size[0]); writeString(hasRole, "role", value.getRole(), writable, encodingCache); @@ -83,19 +85,15 @@ private static void writeToolCallArray( } } - private static boolean isNotBlank(final String value, final int[] nonBlankCount) { - final boolean hasText = Strings.isNotBlank(value); - if (hasText) { - nonBlankCount[0]++; + /** Counts a field towards the map size when it is present, and reports whether it is. */ + private static boolean present(final boolean present, final int[] fieldCount) { + if (present) { + fieldCount[0]++; } - return hasText; + return present; } - private static boolean isNotEmpty(final List value, final int[] nonEmptyCount) { - final boolean nonEmpty = value != null && !value.isEmpty(); - if (nonEmpty) { - nonEmptyCount[0]++; - } - return nonEmpty; + private static boolean isNotEmpty(final List value) { + return value != null && !value.isEmpty(); } } diff --git a/communication/src/test/groovy/datadog/communication/serialization/aiguard/MessageWriterTest.groovy b/communication/src/test/groovy/datadog/communication/serialization/aiguard/MessageWriterTest.groovy index 45191a2fc8f..fb55fc0e0a8 100644 --- a/communication/src/test/groovy/datadog/communication/serialization/aiguard/MessageWriterTest.groovy +++ b/communication/src/test/groovy/datadog/communication/serialization/aiguard/MessageWriterTest.groovy @@ -224,6 +224,40 @@ class MessageWriterTest extends DDSpecification { } } + void 'test write message with empty content'() { + given: + // The redaction "remove" strategy replaces content with "", which must stay visible as an + // empty string rather than being dropped like a message that never carried content. + final message = AIGuard.Message.message('user', '') + + when: + writer.writeObject(message, encodingCache) + + then: + try (final unpacker = MessagePack.newDefaultUnpacker(buffer.slice())) { + final value = asStringValueMap(unpacker.unpackValue()) + assert value.size() == 2 + assert value.role == 'user' + assert value.content == '' + } + } + + void 'test write message without content'() { + given: + final message = AIGuard.Message.message('user', (String) null) + + when: + writer.writeObject(message, encodingCache) + + then: + try (final unpacker = MessagePack.newDefaultUnpacker(buffer.slice())) { + final value = asStringValueMap(unpacker.unpackValue()) + assert value.size() == 1 + assert value.role == 'user' + assert !value.containsKey('content') + } + } + void 'test backward compatibility with string content'() { given: final message = AIGuard.Message.message('user', 'Plain text message') diff --git a/components/annotations/gradle.lockfile b/components/annotations/gradle.lockfile index c557c7cd3ac..b0547110905 100644 --- a/components/annotations/gradle.lockfile +++ b/components/annotations/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/components/context/gradle.lockfile b/components/context/gradle.lockfile index 0bdebfaada8..dbdac80210e 100644 --- a/components/context/gradle.lockfile +++ b/components/context/gradle.lockfile @@ -4,9 +4,10 @@ # 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.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +53,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath @@ -73,4 +73,4 @@ org.spockframework:spock-core:2.4-groovy-3.0=testCompileClasspath,testRuntimeCla org.tabletest:tabletest-junit:1.2.2=testCompileClasspath,testRuntimeClasspath org.tabletest:tabletest-parser:1.2.1=testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -empty=annotationProcessor,runtimeClasspath,spotbugsPlugins,testAnnotationProcessor +empty=annotationProcessor,spotbugsPlugins,testAnnotationProcessor diff --git a/components/environment/gradle.lockfile b/components/environment/gradle.lockfile index 42ce1644fdd..ab0046c94d1 100644 --- a/components/environment/gradle.lockfile +++ b/components/environment/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/components/http/http-api/gradle.lockfile b/components/http/http-api/gradle.lockfile index bb9ff39023b..3aef77e94f7 100644 --- a/components/http/http-api/gradle.lockfile +++ b/components/http/http-api/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mock-server:mockserver-junit-jupiter-no-dependencies:5.14.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/components/json/gradle.lockfile b/components/json/gradle.lockfile index 1e6eaef7b8e..fe3739a7865 100644 --- a/components/json/gradle.lockfile +++ b/components/json/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -54,7 +54,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath diff --git a/components/native-loader/gradle.lockfile b/components/native-loader/gradle.lockfile index 4708a19b318..43abad803ac 100644 --- a/components/native-loader/gradle.lockfile +++ b/components/native-loader/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-aiguard/build.gradle b/dd-java-agent/agent-aiguard/build.gradle index ad2a97bbf93..7047ed3d34c 100644 --- a/dd-java-agent/agent-aiguard/build.gradle +++ b/dd-java-agent/agent-aiguard/build.gradle @@ -22,6 +22,8 @@ dependencies { implementation project(':communication') testImplementation project(':utils:test-utils') + testImplementation libs.bundles.junit5 + testImplementation libs.bundles.mockito testImplementation('org.skyscreamer:jsonassert:1.5.3') testImplementation('com.fasterxml.jackson.core:jackson-databind:2.20.0') } diff --git a/dd-java-agent/agent-aiguard/gradle.lockfile b/dd-java-agent/agent-aiguard/gradle.lockfile index baf0cc6ffd1..ffeb62663cc 100644 --- a/dd-java-agent/agent-aiguard/gradle.lockfile +++ b/dd-java-agent/agent-aiguard/gradle.lockfile @@ -8,6 +8,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -24,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -76,7 +77,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 d921be448d8..60b51ec0a4b 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 @@ -28,6 +28,8 @@ import datadog.trace.api.aiguard.noop.NoOpEvaluator; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.telemetry.WafMetricCollector; +import datadog.trace.api.telemetry.WafMetricCollector.AIGuardError; +import datadog.trace.api.telemetry.WafMetricCollector.AIGuardRedaction; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; @@ -51,6 +53,8 @@ import okhttp3.Response; import okhttp3.ResponseBody; import okio.BufferedSink; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Concrete implementation of the SDK used to interact with the AIGuard REST API. @@ -60,6 +64,8 @@ */ public class AIGuardInternal implements Evaluator { + private static final Logger log = LoggerFactory.getLogger(AIGuardInternal.class); + public static class BadConfigurationException extends RuntimeException { public BadConfigurationException(final String message) { super(message); @@ -72,6 +78,9 @@ public BadConfigurationException(final String message) { static final String ACTION_TAG = "ai_guard.action"; static final String REASON_TAG = "ai_guard.reason"; static final String BLOCKED_TAG = "ai_guard.blocked"; + static final String REDACTED_TAG = "ai_guard.redacted"; + + static final String RESPONSE_REDACTION_REPLACEMENTS = "redaction_replacements"; static final String META_STRUCT_TAG = "ai_guard"; static final String META_STRUCT_MESSAGES = "messages"; @@ -128,6 +137,7 @@ static void uninstall() { private final OkHttpClient client; private final Map meta; private final Map headers; + private final MessageRedactor redactor; AIGuardInternal(final HttpUrl url, final Map headers, final OkHttpClient client) { this.url = url; @@ -136,13 +146,17 @@ static void uninstall() { this.moshi = new Moshi.Builder().add(new AIGuardFactory()).build(); final Config config = Config.get(); this.meta = mapOf("service", config.getServiceName(), "env", config.getEnv()); + this.redactor = + config.isAiGuardRedactionEnabled() + ? new MessageRedactor.DefaultRedactor() + : new MessageRedactor.NoOp(); } /** * Creates a deep copy of the messages before storing them in the metastruct to avoid concurrent * modifications prior to trace serialization. */ - private static List messagesForMetaStruct(List messages) { + private static List messagesForMetaStruct(final List messages) { final Config config = Config.get(); final int size = Math.min(messages.size(), config.getAiGuardMaxMessagesLength()); if (size < messages.size()) { @@ -191,6 +205,45 @@ private static List messagesForMetaStruct(List messages) { return result; } + /** + * Applies the redaction requested by the AI Guard service and reports the outcome on the span. + * + *

This runs before the rest of the response is interpreted on purpose. Every surface that + * reports the conversation must report it redacted, and both the blocking decision and the + * response validation that precedes it can leave the evaluation through the meta struct: a + * blocked evaluation still reports through it, and so does a response the tracer rejects. The + * {@link AIGuardAbortError} raised on the blocked path deliberately carries no messages. + * + *

The {@code ai_guard.redacted} tag is set to {@code false} before the request is issued and + * only raised here, so an evaluation that fails before this point still reports that nothing was + * redacted rather than looking like the kill switch is off. + * + * @return the telemetry state, {@link AIGuardRedaction#DISABLED} when the kill switch is off, in + * which case no {@code ai_guard.redacted} tag is attached at all + */ + private AIGuardRedaction reportRedaction( + final AgentSpan span, final MessageRedactor.Result redaction) { + if (!redactor.enabled()) { + // No tag at all, so an absent tag ("redaction is off") stays distinguishable from a false + // one ("redaction is on and nothing was redacted"). + return AIGuardRedaction.DISABLED; + } + if (redaction.skipped > 0) { + log.debug( + "AI Guard skipped {} redaction replacement(s) that could not be applied", + redaction.skipped); + // Reported and then forgotten: redaction is best effort and must never fail the evaluation + // it rode in on, so this counts an error without counting a failed request. + WafMetricCollector.get().aiGuardRedactionErrors(redaction.skipped); + } + if (!redaction.redacted()) { + // The tag was already set to false before the request; nothing to correct. + return AIGuardRedaction.NOT_APPLIED; + } + span.setTag(REDACTED_TAG, true); + return AIGuardRedaction.APPLIED; + } + private static boolean isToolCall(final Message message) { return message.getToolCalls() != null || message.getToolCallId() != null; } @@ -283,6 +336,11 @@ public Evaluation evaluate(final List messages, final Options options) // sure client IP tags were populated. copyAnomalyDetectionTags(span, localRootSpan); } + List finalMessages = messages; + // Classifies the ai_guard.error metric when a raise below escapes. A transport failure, and + // anything the tracer cannot attribute to the response, keeps the default; the raises driven + // by the response itself narrow it first. + AIGuardError errorType = AIGuardError.CLIENT_ERROR; try (final ContextScope scope = tracer.activateSpan(span)) { final Message last = messages.get(messages.size() - 1); if (isToolCall(last)) { @@ -294,8 +352,12 @@ public Evaluation evaluate(final List messages, final Options options) } else { span.setTag(TARGET_TAG, "prompt"); } + if (redactor.enabled()) { + // Reported before the request goes out so an evaluation that fails, and therefore redacts + // nothing, still says so. An absent tag stays reserved for the kill switch being off. + span.setTag(REDACTED_TAG, false); + } final Map metaStruct = new HashMap<>(2); - metaStruct.put(META_STRUCT_MESSAGES, messagesForMetaStruct(messages)); span.setMetaStruct(META_STRUCT_TAG, metaStruct); final Request.Builder request = new Request.Builder() @@ -303,19 +365,52 @@ public Evaluation evaluate(final List messages, final Options options) .method("POST", new MoshiJsonRequestBody(moshi, messages, meta)); headers.forEach(request::header); try (final Response response = client.newCall(request.build()).execute()) { - final Map result = parseResponseBody(response); - final String actionStr = (String) result.get("action"); - if (actionStr == null) { - throw new IllegalArgumentException("Action field is missing in the response"); + final Map result; + try { + result = parseResponseBody(response); + } catch (final Exception e) { + // A body we cannot read is a response problem, not a transport one, unless the status + // code already explains the failure on its own. + errorType = response.isSuccessful() ? AIGuardError.BAD_RESPONSE : AIGuardError.BAD_STATUS; + throw e; + } + // Resolved before anything else that can throw: once the service has told us what to + // redact, every reporting surface must carry the redacted conversation, including on the + // paths that reject the rest of the response. + final Object rawReplacements = result.get(RESPONSE_REDACTION_REPLACEMENTS); + // Reported back to the caller verbatim, including entries redaction could not apply. + final List redactionReplacements = + rawReplacements instanceof List ? (List) rawReplacements : null; + // The raw value goes to the redactor: a present payload that is not an array is a + // backend contract break the redactor counts, not something to drop silently. + final MessageRedactor.Result redaction = redactor.redact(messages, rawReplacements); + finalMessages = redaction.messages; + final AIGuardRedaction redactionState = reportRedaction(span, redaction); + final Action action; + final String reason; + final List tags; + final List sdsFindings; + final Map tagProbs; + try { + // Everything here reads the parsed body, so a raise means the service answered with + // something that does not honour the response contract. + final String actionStr = (String) result.get("action"); + if (actionStr == null) { + throw new IllegalArgumentException("Action field is missing in the response"); + } + action = Action.valueOf(actionStr); + reason = (String) result.get("reason"); + @SuppressWarnings("unchecked") + final List parsedTags = (List) result.get("tags"); + tags = parsedTags; + sdsFindings = (List) result.get("sds_findings"); + @SuppressWarnings("unchecked") + final Map parsedTagProbs = (Map) result.get("tag_probs"); + tagProbs = parsedTagProbs; + } catch (final Exception e) { + errorType = AIGuardError.BAD_RESPONSE; + throw e; } - final Action action = Action.valueOf(actionStr); - final String reason = (String) result.get("reason"); - @SuppressWarnings("unchecked") - final List tags = (List) result.get("tags"); - @SuppressWarnings("unchecked") - final List sdsFindings = (List) result.get("sds_findings"); - @SuppressWarnings("unchecked") - final Map tagProbs = (Map) result.get("tag_probs"); span.setTag(ACTION_TAG, action); if (reason != null) { span.setTag(REASON_TAG, reason); @@ -331,22 +426,25 @@ public Evaluation evaluate(final List messages, final Options options) } final boolean shouldBlock = isBlockingEnabled(options, result.get("is_blocking_enabled")) && action != Action.ALLOW; - WafMetricCollector.get().aiGuardRequest(action, shouldBlock); + WafMetricCollector.get().aiGuardRequest(action, shouldBlock, redactionState); if (shouldBlock) { span.setTag(BLOCKED_TAG, true); throw new AIGuardAbortError(action, reason, tags, tagProbs, sdsFindings); } - return new Evaluation(action, reason, tags, tagProbs, sdsFindings); + return new Evaluation( + action, reason, tags, tagProbs, sdsFindings, redaction.messages, redactionReplacements); + } finally { + metaStruct.put(META_STRUCT_MESSAGES, messagesForMetaStruct(finalMessages)); } } catch (AIGuardAbortError e) { span.addThrowable(e); throw e; } catch (AIGuardClientError e) { - WafMetricCollector.get().aiGuardError(); + WafMetricCollector.get().aiGuardError(errorType); span.addThrowable(e); throw e; } catch (final Exception e) { - WafMetricCollector.get().aiGuardError(); + WafMetricCollector.get().aiGuardError(errorType); final AIGuardClientError error = new AIGuardClientError( "AI Guard service returned unexpected response: " + e.getMessage(), e); diff --git a/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java new file mode 100644 index 00000000000..1c98c47b1bb --- /dev/null +++ b/dd-java-agent/agent-aiguard/src/main/java/com/datadog/aiguard/MessageRedactor.java @@ -0,0 +1,349 @@ +package com.datadog.aiguard; + +import datadog.trace.api.aiguard.AIGuard.ContentPart; +import datadog.trace.api.aiguard.AIGuard.Message; +import datadog.trace.api.aiguard.AIGuard.ToolCall; +import datadog.trace.api.aiguard.AIGuard.ToolCall.Function; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; +import javax.annotation.Nullable; + +public interface MessageRedactor { + + /** Outcome of a redaction pass. */ + final class Result { + + /** The redacted messages, or the very same list that was passed in when nothing was applied. */ + final List messages; + + /** Number of paths successfully overwritten. */ + final int applied; + + /** Number of entries skipped fail-safe (unresolvable, non-string, missing or conflicting). */ + final int skipped; + + private Result(final List messages, final int applied, final int skipped) { + this.messages = messages; + this.applied = applied; + this.skipped = skipped; + } + + /** Whether at least one replacement was applied. */ + boolean redacted() { + return applied > 0; + } + + private static Result nothingApplied(final List messages, final int skipped) { + return new Result(messages, 0, skipped); + } + } + + /** + * @param replacements the raw {@code redaction_replacements} value from the response, exactly as + * it was parsed. It is deliberately untyped: a present value that is not an array is a + * backend contract break, and only an enabled redactor is in a position to count it. + */ + Result redact(final List messages, @Nullable final Object replacements); + + /** + * Whether redaction is active. When {@code false} the {@code ai_guard.redacted} tag is not + * reported at all, so an absent tag means "redaction is off", which stays distinguishable from a + * {@code false} one meaning "redaction is on and nothing was redacted". + */ + boolean enabled(); + + class NoOp implements MessageRedactor { + + @Override + public Result redact(final List messages, final @Nullable Object replacements) { + // The kill switch is off, so no redaction work is attempted and no redaction error is + // reported, not even for a malformed payload. + return Result.nothingApplied(messages, 0); + } + + @Override + public boolean enabled() { + return false; + } + } + + /** + * Applies the {@code redaction_replacements} returned by the AI Guard service to a message list. + * + *

The service returns the fully redacted string for each affected path, so this class + * never slices, concatenates, or reasons about offsets and string encodings: it resolves a path + * to a single string and overwrites it verbatim. Placeholder selection and redaction strategy are + * resolved server side and already baked into each replacement. + * + *

Two properties matter to callers: + * + *

    + *
  • Copy on write. The caller's list and messages are never mutated. Only + * the messages that are actually redacted are rebuilt; the rest are shared with the input + * list. When nothing is applied, {@link Result#messages} is the very same reference that + * was passed in, so {@code result.messages != messages} tells the caller whether anything + * changed. + *
  • Never throws. A malformed response must not break the caller's control + * flow, so unresolvable paths, non-string targets, and missing or conflicting replacements + * are skipped and counted in {@link Result#skipped}. + *
+ */ + class DefaultRedactor implements MessageRedactor { + + @Override + public boolean enabled() { + return true; + } + + /** + * Matches a single path segment, e.g. {@code messages[1]} or {@code function}. Kept verbatim + * from the cross-tracer specification, so every tracer tokenizes paths identically. + */ + private static final Pattern SEGMENT = + Pattern.compile("\\A([A-Za-z0-9_]+)(?:\\[([0-9]+)\\])?\\z"); + + /** No supported target is deeper than {@code messages[i].tool_calls[k].function.arguments}. */ + private static final int MAX_SEGMENTS = 4; + + private static final int NO_INDEX = -1; + private static final int INVALID_INDEX = -2; + + /** Longest index we bother parsing; anything longer cannot address a real list. */ + private static final int MAX_INDEX_DIGITS = 9; + + /** + * Overwrites every path in {@code replacements} with its replacement string. + * + * @param messages the evaluated messages, never mutated + * @param rawReplacements the raw {@code redaction_replacements} value from the response + * @return the redaction outcome, holding {@code messages} itself when nothing was applied + */ + @Override + public Result redact(final List messages, @Nullable final Object rawReplacements) { + if (messages == null || messages.isEmpty() || rawReplacements == null) { + return Result.nothingApplied(messages, 0); + } + if (!(rawReplacements instanceof List)) { + // The field is present but is not an array, so there is no entry to even look at. Counted + // as one error rather than dropped: the backend broke the response contract. + return Result.nothingApplied(messages, 1); + } + final List replacements = (List) rawReplacements; + if (replacements.isEmpty()) { + return Result.nothingApplied(messages, 0); + } + + int skipped = 0; + + // Collect one authoritative replacement per path, dropping the ones the backend contradicts + // itself on. Insertion ordered so that a malformed response yields reproducible counters. + final Map byPath = new LinkedHashMap<>(); + Set conflicting = null; + for (final Object entry : replacements) { + if (!(entry instanceof Map)) { + skipped++; + continue; + } + final Map map = (Map) entry; + final Object path = map.get("path"); + final Object replacement = map.get("replacement"); + // An empty replacement is legitimate: "" is a supported placeholder meaning "remove". + if (!(path instanceof String) + || ((String) path).isEmpty() + || !(replacement instanceof String)) { + skipped++; + continue; + } + final String previous = byPath.put((String) path, (String) replacement); + if (previous != null && !previous.equals(replacement)) { + // Conflicting replacements for one path: skip it rather than guess which one wins. + if (conflicting == null) { + conflicting = new HashSet<>(2); + } + conflicting.add((String) path); + } + } + if (conflicting != null) { + for (final String path : conflicting) { + byPath.remove(path); + skipped++; + } + } + if (byPath.isEmpty()) { + return Result.nothingApplied(messages, skipped); + } + + final String[] names = new String[MAX_SEGMENTS]; + final int[] indices = new int[MAX_SEGMENTS]; + List working = null; + int applied = 0; + + for (final Map.Entry entry : byPath.entrySet()) { + final int count = parseSegments(entry.getKey(), names, indices); + // Paths are rooted at the evaluated array, so they always start with `messages[i]`. + if (count < 2 + || indices[0] == NO_INDEX + || !"messages".equals(names[0]) + || indices[0] >= messages.size()) { + skipped++; + continue; + } + final int index = indices[0]; + final Message current = working == null ? messages.get(index) : working.get(index); + final Message updated = apply(current, names, indices, count, entry.getValue()); + if (updated == null) { + skipped++; + continue; + } + if (working == null) { + working = new ArrayList<>(messages); + } + working.set(index, updated); + applied++; + } + + if (working == null) { + return Result.nothingApplied(messages, skipped); + } + return new Result(working, applied, skipped); + } + + /** + * Rebuilds {@code message} with {@code replacement} written at the target the path resolves to. + * + * @return the rebuilt message, or {@code null} when the path does not resolve to a writable + * string, in which case the caller skips it fail-safe + */ + @Nullable + private static Message apply( + final Message message, + final String[] names, + final int[] indices, + final int count, + final String replacement) { + + if ("content".equals(names[1])) { + if (indices[1] == NO_INDEX) { + // messages[i].content + if (count != 2 || message.getContentParts() != null || message.getContent() == null) { + // A message holding content parts resolves to a list, not a string: skip. + return null; + } + return withContent(message, replacement); + } + // messages[i].content[j].text + if (count != 3 || !"text".equals(names[2]) || indices[2] != NO_INDEX) { + return null; + } + final List parts = message.getContentParts(); + if (parts == null || indices[1] >= parts.size()) { + return null; + } + final ContentPart part = parts.get(indices[1]); + // Only text parts are redactable; image locators are out of scope. + if (part.getType() != ContentPart.Type.TEXT) { + return null; + } + final List updated = new ArrayList<>(parts); + updated.set(indices[1], ContentPart.text(replacement)); + return withContentParts(message, updated); + } + + if ("tool_calls".equals(names[1])) { + // messages[i].tool_calls[k].function.arguments + if (indices[1] == NO_INDEX + || count != 4 + || !"function".equals(names[2]) + || indices[2] != NO_INDEX + || !"arguments".equals(names[3]) + || indices[3] != NO_INDEX) { + return null; + } + final List toolCalls = message.getToolCalls(); + if (toolCalls == null || indices[1] >= toolCalls.size()) { + return null; + } + final ToolCall toolCall = toolCalls.get(indices[1]); + final Function function = toolCall.getFunction(); + if (function == null || function.getArguments() == null) { + return null; + } + final List updated = new ArrayList<>(toolCalls); + updated.set( + indices[1], + new ToolCall(toolCall.getId(), new Function(function.getName(), replacement))); + return withToolCalls(message, updated); + } + + return null; + } + + private static Message withContent(final Message message, final String content) { + return new Message( + message.getRole(), content, message.getToolCalls(), message.getToolCallId()); + } + + private static Message withContentParts( + final Message message, final List contentParts) { + return new Message( + message.getRole(), contentParts, message.getToolCalls(), message.getToolCallId()); + } + + private static Message withToolCalls(final Message message, final List toolCalls) { + final List contentParts = message.getContentParts(); + // A message carries either content parts or a content string, never both; preserve whichever. + return contentParts != null + ? new Message(message.getRole(), contentParts, toolCalls, message.getToolCallId()) + : new Message( + message.getRole(), message.getContent(), toolCalls, message.getToolCallId()); + } + + /** + * Splits a path on {@code .} and matches every segment against {@link #SEGMENT}, filling {@code + * names} and {@code indices}. + * + * @return the number of segments, or {@code -1} when any segment is malformed or the path is + * deeper than any supported target + */ + private static int parseSegments(final String path, final String[] names, final int[] indices) { + int count = 0; + int start = 0; + while (true) { + if (count == MAX_SEGMENTS) { + return -1; + } + final int dot = path.indexOf('.', start); + final String segment = dot < 0 ? path.substring(start) : path.substring(start, dot); + final Matcher matcher = SEGMENT.matcher(segment); + if (!matcher.matches()) { + return -1; + } + final int index = parseIndex(matcher.group(2)); + if (index == INVALID_INDEX) { + return -1; + } + names[count] = matcher.group(1); + indices[count] = index; + count++; + if (dot < 0) { + return count; + } + start = dot + 1; + } + } + + private static int parseIndex(@Nullable final String index) { + if (index == null) { + return NO_INDEX; + } + // The regex guarantees digits only, so the sole remaining hazard is overflow. + return index.length() > MAX_INDEX_DIGITS ? INVALID_INDEX : Integer.parseInt(index); + } + } +} 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 114e83da3f1..ea52a9d4d7e 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 @@ -225,7 +225,8 @@ class AIGuardInternalTests extends DDSpecification { eval.tagProbabilities == suite.tagProbabilities eval.sds == [] } - assertTelemetry('ai_guard.requests', "action:$suite.action", "block:$throwAbortError", 'error:false') + // no redaction_replacements in these responses, and redaction is on by default + assertTelemetry('requests', "action:$suite.action", "block:$throwAbortError", 'error:false', 'redacted:false') where: suite << TestSuite.build() @@ -390,7 +391,7 @@ class AIGuardInternalTests extends DDSpecification { final exception = thrown(AIGuard.AIGuardClientError) exception.errors == errors 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) - assertTelemetry('ai_guard.requests', 'error:true') + assertErrorTelemetry('bad_status') } void 'test evaluate with invalid JSON'() { @@ -403,7 +404,7 @@ class AIGuardInternalTests extends DDSpecification { then: thrown(AIGuard.AIGuardClientError) 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) - assertTelemetry('ai_guard.requests', 'error:true') + assertErrorTelemetry('bad_response') } void 'test evaluate with missing action'() { @@ -416,7 +417,7 @@ class AIGuardInternalTests extends DDSpecification { then: thrown(AIGuard.AIGuardClientError) 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) - assertTelemetry('ai_guard.requests', 'error:true') + assertErrorTelemetry('bad_response') } void 'test evaluate with non JSON response'() { @@ -429,7 +430,7 @@ class AIGuardInternalTests extends DDSpecification { then: thrown(AIGuard.AIGuardClientError) 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) - assertTelemetry('ai_guard.requests', 'error:true') + assertErrorTelemetry('bad_response') } void 'test evaluate with empty response'() { @@ -442,11 +443,32 @@ class AIGuardInternalTests extends DDSpecification { then: thrown(AIGuard.AIGuardClientError) 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) - assertTelemetry('ai_guard.requests', 'error:true') + assertErrorTelemetry('bad_response') + } + + void 'test evaluate with a transport failure'() { + given: + final call = Stub(Call) { + execute() >> { throw new IOException('connection reset') } + } + final client = Stub(OkHttpClient) { + newCall(_ as Request) >> call + } + final aiguard = new AIGuardInternal(URL, HEADERS, client) + + when: + aiguard.evaluate(TOOL_CALL, AIGuard.Options.DEFAULT) + + then: + thrown(AIGuard.AIGuardClientError) + 1 * span.addThrowable(_ as AIGuard.AIGuardClientError) + // nothing about the response is known, so the failure keeps the default classification + assertErrorTelemetry('client_error') } void 'test message length truncation'() { given: + Map receivedMeta = null final maxMessages = Config.get().getAiGuardMaxMessagesLength() final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'It is fine']]]) final messages = (0..maxMessages) @@ -458,15 +480,18 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final received = (List) it[1].messages - assert received.size() == maxMessages - assert received.size() < messages.size() + receivedMeta = it[1] as Map + return span } - assertTelemetry('ai_guard.truncated', 'type:messages') + final received = (List) receivedMeta.messages + assert received.size() == maxMessages + assert received.size() < messages.size() + assertTelemetry('truncated', 'type:messages') } void 'test message content truncation'() { given: + Map receivedMeta = null final maxContent = Config.get().getAiGuardMaxContentSize() final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'It is fine']]]) final message = AIGuard.Message.message("user", (0..maxContent).collect { 'A' }.join()) @@ -476,13 +501,14 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final received = (List) it[1].messages - received.last().with { - assert it.content.length() == maxContent - assert it.content.length() < message.content.length() - } + receivedMeta = it[1] as Map + return span } - assertTelemetry('ai_guard.truncated', 'type:content') + final received = (List) receivedMeta.messages + final truncated = received.last() + assert truncated.content.length() == maxContent + assert truncated.content.length() < message.content.length() + assertTelemetry('truncated', 'type:content') } void 'test no messages'() { @@ -646,20 +672,41 @@ class AIGuardInternalTests extends DDSpecification { } private static assertTelemetry(final String metric, final String...tags) { - final metrics = WafMetricCollector.get().with { - prepareMetrics() - drain() - } + return assertTelemetry(drainAIGuard(), metric, tags) + } + + /** + * Asserts one ai_guard metric out of an already drained batch. Every metric in the namespace + * carries the call path, constant while a direct SDK call is the only way to reach an evaluation. + */ + private static assertTelemetry(final List metrics, final String metric, final String...tags) { + final expected = tags.toList() + ['source:sdk', 'integration:none'] final filtered = metrics.findAll { - it.namespace == 'appsec' - && it.metricName == metric - && it.tags == tags.toList() + it.namespace == 'ai_guard' && it.metricName == metric && it.tags == expected } assert filtered.size() == 1 : metrics assert filtered*.value.sum() == 1 return true } + /** + * A failed evaluation is reported twice: as a failed request, which keeps the request count + * complete, and under ai_guard.error with the type that classifies the failure. + */ + private static assertErrorTelemetry(final String type) { + final metrics = drainAIGuard() + assertTelemetry(metrics, 'requests', 'error:true') + assertTelemetry(metrics, 'error', "type:$type") + return true + } + + private static List drainAIGuard() { + return WafMetricCollector.get().with { + prepareMetrics() + drain() + } + } + private static assertMeta(final Map meta, final TestSuite suite) { if (suite.tags) { assert meta.attack_categories == suite.tags @@ -700,16 +747,17 @@ class AIGuardInternalTests extends DDSpecification { private static Response mockResponse(final Request request, final int status, final Object body) { return new Response.Builder() - .protocol(Protocol.HTTP_1_1) - .message('ok') - .request(request) - .code(status) - .body(body == null ? null : ResponseBody.create(MediaType.parse('application/json'), MOSHI.adapter(Object).toJson(body))) - .build() + .protocol(Protocol.HTTP_1_1) + .message('ok') + .request(request) + .code(status) + .body(body == null ? null : ResponseBody.create(MediaType.parse('application/json'), MOSHI.adapter(Object).toJson(body))) + .build() } void 'test JSON serialization with text content parts'() { given: + Map receivedMeta = null final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final messages = [AIGuard.Message.message('user', [AIGuard.ContentPart.text('Hello world')])] @@ -718,18 +766,19 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages.size() == 1 - assert receivedMessages[0].contentParts.size() == 1 - assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.TEXT - assert receivedMessages[0].contentParts[0].text == 'Hello world' + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages.size() == 1 + assert receivedMessages[0].contentParts.size() == 1 + assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.TEXT + assert receivedMessages[0].contentParts[0].text == 'Hello world' } void 'test JSON serialization with image_url content parts'() { given: + Map receivedMeta = null final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final messages = [ AIGuard.Message.message('user', [AIGuard.ContentPart.imageUrl('https://example.com/image.jpg')]) @@ -740,18 +789,19 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages.size() == 1 - assert receivedMessages[0].contentParts.size() == 1 - assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.IMAGE_URL - assert receivedMessages[0].contentParts[0].imageUrl.url == 'https://example.com/image.jpg' + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages.size() == 1 + assert receivedMessages[0].contentParts.size() == 1 + assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.IMAGE_URL + assert receivedMessages[0].contentParts[0].imageUrl.url == 'https://example.com/image.jpg' } void 'test JSON serialization with mixed content parts'() { given: + Map receivedMeta = null final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final messages = [ AIGuard.Message.message('user', [ @@ -766,22 +816,23 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages.size() == 1 - assert receivedMessages[0].contentParts.size() == 3 - assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.TEXT - assert receivedMessages[0].contentParts[0].text == 'Describe this image:' - assert receivedMessages[0].contentParts[1].type == AIGuard.ContentPart.Type.IMAGE_URL - assert receivedMessages[0].contentParts[1].imageUrl.url == 'https://example.com/image.jpg' - assert receivedMessages[0].contentParts[2].type == AIGuard.ContentPart.Type.TEXT - assert receivedMessages[0].contentParts[2].text == 'What do you see?' + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages.size() == 1 + assert receivedMessages[0].contentParts.size() == 3 + assert receivedMessages[0].contentParts[0].type == AIGuard.ContentPart.Type.TEXT + assert receivedMessages[0].contentParts[0].text == 'Describe this image:' + assert receivedMessages[0].contentParts[1].type == AIGuard.ContentPart.Type.IMAGE_URL + assert receivedMessages[0].contentParts[1].imageUrl.url == 'https://example.com/image.jpg' + assert receivedMessages[0].contentParts[2].type == AIGuard.ContentPart.Type.TEXT + assert receivedMessages[0].contentParts[2].text == 'What do you see?' } void 'test content parts order is preserved'() { given: + Map receivedMeta = null final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final parts = (0..4).collect { it % 2 == 0 ? AIGuard.ContentPart.text("Text $it") : AIGuard.ContentPart.imageUrl("https://example.com/image${it}.jpg") @@ -793,24 +844,25 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages[0].contentParts.size() == 5 - (0..4).each { i -> - if (i % 2 == 0) { - assert receivedMessages[0].contentParts[i].type == AIGuard.ContentPart.Type.TEXT - assert receivedMessages[0].contentParts[i].text == "Text $i" - } else { - assert receivedMessages[0].contentParts[i].type == AIGuard.ContentPart.Type.IMAGE_URL - assert receivedMessages[0].contentParts[i].imageUrl.url == "https://example.com/image${i}.jpg" - } - } + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages[0].contentParts.size() == 5 + (0..4).each { i -> + if (i % 2 == 0) { + assert receivedMessages[0].contentParts[i].type == AIGuard.ContentPart.Type.TEXT + assert receivedMessages[0].contentParts[i].text == "Text $i" + } else { + assert receivedMessages[0].contentParts[i].type == AIGuard.ContentPart.Type.IMAGE_URL + assert receivedMessages[0].contentParts[i].imageUrl.url == "https://example.com/image${i}.jpg" + } + } } void 'test content part text truncation'() { given: + Map receivedMeta = null final maxContent = Config.get().getAiGuardMaxContentSize() final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final longText = (0..maxContent).collect { 'A' }.join() @@ -823,19 +875,20 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages[0].contentParts.size() == 2 - assert receivedMessages[0].contentParts[0].text.length() == maxContent - assert receivedMessages[0].contentParts[0].text.length() < longText.length() - assert receivedMessages[0].contentParts[1].text == 'Short text' + receivedMeta = it[1] as Map return span } - assertTelemetry('ai_guard.truncated', 'type:content') + final receivedMessages = receivedMeta.messages as List + assert receivedMessages[0].contentParts.size() == 2 + assert receivedMessages[0].contentParts[0].text.length() == maxContent + assert receivedMessages[0].contentParts[0].text.length() < longText.length() + assert receivedMessages[0].contentParts[1].text == 'Short text' + assertTelemetry('truncated', 'type:content') } void 'test content part image_url not truncated even with long data URI'() { given: + Map receivedMeta = null final maxContent = Config.get().getAiGuardMaxContentSize() final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) // Create a very long data URI (longer than max content size) @@ -852,21 +905,21 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages[0].contentParts.size() == 2 - assert receivedMessages[0].contentParts[1].type == AIGuard.ContentPart.Type.IMAGE_URL - // Image URL should NOT be truncated - assert receivedMessages[0].contentParts[1].imageUrl.url == longDataUri - assert receivedMessages[0].contentParts[1].imageUrl.url.length() > maxContent + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages[0].contentParts.size() == 2 + assert receivedMessages[0].contentParts[1].type == AIGuard.ContentPart.Type.IMAGE_URL + // Image URL should NOT be truncated + assert receivedMessages[0].contentParts[1].imageUrl.url == longDataUri + assert receivedMessages[0].contentParts[1].imageUrl.url.length() > maxContent } void 'test adapter serializes content parts'() { given: final adapter = new Moshi.Builder().add(new AIGuardInternal.AIGuardFactory()).build() - .adapter(AIGuard.Message) + .adapter(AIGuard.Message) expect: // STRICT enforces array element ordering (object key order is always ignored), so a regression @@ -887,6 +940,7 @@ class AIGuardInternalTests extends DDSpecification { void 'test backward compatibility with string content'() { given: + Map receivedMeta = null final aiguard = mockClient(200, [data: [attributes: [action: 'ALLOW', reason: 'Good']]]) final messages = [AIGuard.Message.message('user', 'Hello world')] @@ -895,13 +949,13 @@ class AIGuardInternalTests extends DDSpecification { then: 1 * span.setMetaStruct(AIGuardInternal.META_STRUCT_TAG, _) >> { - final meta = it[1] as Map - final receivedMessages = meta.messages as List - assert receivedMessages.size() == 1 - assert receivedMessages[0].content == 'Hello world' - assert receivedMessages[0].contentParts == null + receivedMeta = it[1] as Map return span } + final receivedMessages = receivedMeta.messages as List + assert receivedMessages.size() == 1 + assert receivedMessages[0].content == 'Hello world' + assert receivedMessages[0].contentParts == null } private static class TestSuite { @@ -947,14 +1001,14 @@ class AIGuardInternalTests extends DDSpecification { @Override String toString() { return "TestSuite{" + - "description='" + description + '\'' + - ", action=" + action + - ", reason='" + reason + '\'' + - ", blocking=" + blocking + - ", target='" + target + '\'' + - ", messages=" + messages.collect {it.content } + '\'' + - ", tags=" + tags + - '}' + "description='" + description + '\'' + + ", action=" + action + + ", reason='" + reason + '\'' + + ", blocking=" + blocking + + ", target='" + target + '\'' + + ", messages=" + messages.collect {it.content } + '\'' + + ", tags=" + tags + + '}' } } } diff --git a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java new file mode 100644 index 00000000000..4822bdf432d --- /dev/null +++ b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/AIGuardInternalRedactionTest.java @@ -0,0 +1,420 @@ +package com.datadog.aiguard; + +import static com.datadog.aiguard.AIGuardInternal.META_STRUCT_MESSAGES; +import static com.datadog.aiguard.AIGuardInternal.META_STRUCT_TAG; +import static com.datadog.aiguard.AIGuardInternal.REDACTED_TAG; +import static java.util.Arrays.asList; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyBoolean; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.Mockito.RETURNS_DEEP_STUBS; +import static org.mockito.Mockito.doAnswer; +import static org.mockito.Mockito.lenient; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +import datadog.context.ContextScope; +import datadog.trace.api.aiguard.AIGuard.AIGuardAbortError; +import datadog.trace.api.aiguard.AIGuard.AIGuardClientError; +import datadog.trace.api.aiguard.AIGuard.Evaluation; +import datadog.trace.api.aiguard.AIGuard.Message; +import datadog.trace.api.aiguard.AIGuard.Options; +import datadog.trace.api.telemetry.MetricCollector; +import datadog.trace.api.telemetry.WafMetricCollector; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.test.junit.utils.config.WithConfigExtension; +import java.io.IOException; +import java.util.Collections; +import java.util.List; +import java.util.Map; +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.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +/** Covers how {@link AIGuardInternal} wires the backend redaction decision into an evaluation. */ +@ExtendWith(WithConfigExtension.class) +class AIGuardInternalRedactionTest { + + private static final HttpUrl URL = + HttpUrl.parse("https://app.datadoghq.com/api/v2/ai-guard/evaluate"); + + private static final String SENSITIVE = "My SSN is 123-45-6789"; + private static final String REDACTED = "My SSN is "; + + private static final List MESSAGES = + asList( + Message.message("system", "You are a helpful assistant."), + Message.message("user", SENSITIVE)); + + private AgentSpan span; + private AgentTracer.TracerAPI originalTracer; + private Map metaStruct; + + @BeforeEach + void setUp() { + originalTracer = AgentTracer.get(); + + span = mock(AgentSpan.class); + lenient().when(span.getLocalRootSpan()).thenReturn(mock(AgentSpan.class)); + doAnswer( + invocation -> { + metaStruct = invocation.getArgument(1); + return span; + }) + .when(span) + .setMetaStruct(eq(META_STRUCT_TAG), any()); + + final AgentTracer.SpanBuilder builder = mock(AgentTracer.SpanBuilder.class, RETURNS_DEEP_STUBS); + lenient().when(builder.start()).thenReturn(span); + final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class); + lenient().when(tracer.buildSpan(anyString(), anyString())).thenReturn(builder); + lenient().when(tracer.activateSpan(any())).thenReturn(mock(ContextScope.class)); + AgentTracer.forceRegister(tracer); + } + + @AfterEach + void tearDown() { + AgentTracer.forceRegister(originalTracer); + AIGuardInternal.uninstall(); + } + + @Test + void redactsMessagesAndRewritesMetaStruct() { + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + assertEquals(REDACTED, evaluation.getMessages().get(1).getContent()); + // the untouched message is carried over as is + assertEquals("You are a helpful assistant.", evaluation.getMessages().get(0).getContent()); + assertEquals(REDACTED, metaStructMessages().get(1).getContent()); + verify(span).setTag(REDACTED_TAG, true); + // the caller's list is left alone + assertEquals(SENSITIVE, MESSAGES.get(1).getContent()); + } + + @Test + void reportsNotRedactedWhenResponseCarriesNoReplacements() { + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, null)); + + assertSame(MESSAGES, evaluation.getMessages()); + assertEquals(SENSITIVE, metaStructMessages().get(1).getContent()); + verify(span).setTag(REDACTED_TAG, false); + } + + @Test + void reportsNotRedactedWhenReplacementsAreEmpty() { + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "[]")); + + assertSame(MESSAGES, evaluation.getMessages()); + verify(span).setTag(REDACTED_TAG, false); + } + + @Test + void reportsNotRedactedWhenEveryReplacementIsSkipped() { + final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]"; + + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, unresolvable)); + + assertSame(MESSAGES, evaluation.getMessages()); + assertEquals(SENSITIVE, metaStructMessages().get(1).getContent()); + verify(span).setTag(REDACTED_TAG, false); + } + + @Test + void killSwitchLeavesMessagesUntouchedAndEmitsNoTag() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + assertSame(MESSAGES, evaluation.getMessages()); + assertEquals(SENSITIVE, metaStructMessages().get(1).getContent()); + // an absent tag means "redaction is off", which is distinct from a false one + verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean()); + } + + @Test + void redactsMetaStructOnBlockedEvaluation() { + final AIGuardAbortError error = + assertThrows( + AIGuardAbortError.class, + () -> evaluate(responseWith("DENY", true, replacements(REDACTED)))); + + // reporting is still redacted on the blocked path + assertEquals(REDACTED, metaStructMessages().get(1).getContent()); + verify(span).setTag(REDACTED_TAG, true); + + // the abort error must not carry the conversation, redacted or otherwise + assertFalse(errorText(error).contains(SENSITIVE)); + assertFalse(errorText(error).contains(REDACTED)); + } + + /** + * The meta struct messages are built exactly once per evaluation, in the {@code finally} that + * closes the request, so one evaluation reports one truncation no matter how much redaction it + * applied. + */ + @Test + void reportsContentTruncationOnlyOnceWhenRedacting() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_MAX_CONTENT_SIZE", "8", false); + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + assertEquals(1, truncationMetrics()); + } + + @Test + void reportsRedactedTrueInTelemetryWhenSomethingWasRedacted() { + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + assertTrue(requestTags().contains("redacted:true")); + } + + @Test + void reportsRedactedFalseInTelemetryWhenNothingWasRedacted() { + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, null)); + + assertTrue(requestTags().contains("redacted:false")); + } + + @Test + void reportsNoRedactedTagInTelemetryWhenKillSwitchIsOff() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + final List tags = requestTags(); + // absence of the tag is what tells a consumer that redaction is off + assertFalse(tags.contains("redacted:true")); + assertFalse(tags.contains("redacted:false")); + assertTrue(tags.contains("error:false")); + } + + private static List requestTags() { + WafMetricCollector.get().prepareMetrics(); + for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) { + if ("requests".equals(metric.metricName)) { + return metric.tags; + } + } + throw new AssertionError("no ai_guard requests metric was reported"); + } + + private static void drainTelemetry() { + WafMetricCollector.get().prepareMetrics(); + WafMetricCollector.get().drain(); + } + + private static long truncationMetrics() { + WafMetricCollector.get().prepareMetrics(); + long count = 0; + for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) { + if ("truncated".equals(metric.metricName)) { + count += metric.value.longValue(); + } + } + return count; + } + + @Test + void reportsTheServiceReplacementsVerbatimIncludingUnappliedEntries() { + final String replacements = + "[{\"path\":\"messages[1].content\",\"replacement\":\"" + + REDACTED + + "\"},{\"path\":\"messages[9].content\",\"replacement\":\"never applied\"}]"; + + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements)); + + assertEquals(REDACTED, evaluation.getMessages().get(1).getContent()); + // messages[9] cannot resolve and is skipped fail-safe, but the service asked for it, so it is + // still reported back to the caller + assertEquals(2, evaluation.getRedactionReplacements().size()); + } + + @Test + void reportsTheServiceReplacementsEvenWhenTheKillSwitchIsOff() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + // nothing was applied, but the service's request is still visible to the caller + assertSame(MESSAGES, evaluation.getMessages()); + assertEquals(1, evaluation.getRedactionReplacements().size()); + } + + @Test + void reportsNotRedactedWhenTheEvaluationFails() { + // no action field, so the response is rejected before any redaction work happens + assertThrows( + AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}")); + + // a failed evaluation redacted nothing, and must not look like the kill switch is off + verify(span).setTag(REDACTED_TAG, false); + verify(span, never()).setTag(REDACTED_TAG, true); + } + + @Test + void redactsMetaStructWhenTheResponseFailsAfterCarryingReplacements() { + // the replacements arrived, but the response is rejected for a missing action field + final String body = + "{\"data\":{\"attributes\":{\"tags\":[],\"redaction_replacements\":" + + replacements(REDACTED) + + "}}}"; + + assertThrows(AIGuardClientError.class, () -> evaluate(body)); + + // the tracer held the replacements, so what it reports must be redacted + assertEquals(REDACTED, metaStructMessages().get(1).getContent()); + } + + @Test + void emitsNoTagWhenTheEvaluationFailsAndTheKillSwitchIsOff() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + + assertThrows( + AIGuardClientError.class, () -> evaluate("{\"data\":{\"attributes\":{\"tags\":[]}}}")); + + verify(span, never()).setTag(eq(REDACTED_TAG), anyBoolean()); + } + + @Test + void doesNotFailWhenReplacementsAreMalformed() { + drainTelemetry(); + + final Evaluation evaluation = evaluate(responseWith("ALLOW", false, "\"not-an-array\"")); + + assertSame(MESSAGES, evaluation.getMessages()); + verify(span).setTag(REDACTED_TAG, false); + // the field is present but is not an array, so the backend broke the response contract + assertEquals(1, redactionErrors()); + } + + @Test + void reportsOneRedactionErrorPerReplacementItCouldNotApply() { + final String unresolvable = + "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}," + + "{\"path\":\"not a path\",\"replacement\":\"nope\"}]"; + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, unresolvable)); + + assertEquals(2, redactionErrors()); + } + + @Test + void reportsNoRedactionErrorWhenEveryReplacementApplies() { + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, replacements(REDACTED))); + + assertEquals(0, redactionErrors()); + } + + @Test + void reportsNoRedactionErrorWhenTheKillSwitchIsOff() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + drainTelemetry(); + + // no redaction work is attempted, so a malformed payload is not even looked at + evaluate(responseWith("ALLOW", false, "\"not-an-array\"")); + + assertEquals(0, redactionErrors()); + } + + /** A redaction error never counts as a failed request: it does not fail the evaluation. */ + @Test + void doesNotCountARedactionErrorAsAFailedRequest() { + final String unresolvable = "[{\"path\":\"messages[9].content\",\"replacement\":\"nope\"}]"; + drainTelemetry(); + + evaluate(responseWith("ALLOW", false, unresolvable)); + + assertTrue(requestTags().contains("error:false")); + } + + private static long redactionErrors() { + WafMetricCollector.get().prepareMetrics(); + long count = 0; + for (final MetricCollector.Metric metric : WafMetricCollector.get().drain()) { + if ("error".equals(metric.metricName) && metric.tags.contains("type:redaction_error")) { + count += metric.value.longValue(); + } + } + return count; + } + + private static String errorText(final AIGuardAbortError error) { + return String.valueOf(error.getMessage()) + error + String.valueOf(error.getReason()); + } + + @SuppressWarnings("unchecked") + private List metaStructMessages() { + assertNotNull(metaStruct, "meta struct was never attached to the span"); + return (List) metaStruct.get(META_STRUCT_MESSAGES); + } + + private static String replacements(final String replacement) { + return "[{\"path\":\"messages[1].content\",\"replacement\":\"" + replacement + "\"}]"; + } + + private static String responseWith( + final String action, final boolean blocking, final String redactionReplacements) { + final StringBuilder attributes = new StringBuilder(); + attributes + .append("{\"action\":\"") + .append(action) + .append("\",\"reason\":\"a reason\",\"is_blocking_enabled\":") + .append(blocking) + .append(",\"tags\":[]"); + if (redactionReplacements != null) { + attributes.append(",\"redaction_replacements\":").append(redactionReplacements); + } + attributes.append('}'); + return "{\"data\":{\"id\":\"1\",\"type\":\"evaluations\",\"attributes\":" + attributes + "}}"; + } + + private Evaluation evaluate(final String responseBody) { + final OkHttpClient client = mock(OkHttpClient.class); + final Call call = mock(Call.class); + try { + lenient().when(call.execute()).thenReturn(response(responseBody)); + } catch (final IOException e) { + throw new AssertionError(e); + } + lenient().when(client.newCall(any(Request.class))).thenReturn(call); + return new AIGuardInternal(URL, Collections.emptyMap(), client) + .evaluate(MESSAGES, new Options().block(true)); + } + + private static Response response(final String json) { + return new Response.Builder() + .protocol(Protocol.HTTP_1_1) + .message("ok") + .request(new Request.Builder().url(URL).build()) + .code(200) + .body(ResponseBody.create(MediaType.parse("application/json"), json)) + .build(); + } +} diff --git a/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java new file mode 100644 index 00000000000..1734cfc4cf6 --- /dev/null +++ b/dd-java-agent/agent-aiguard/src/test/java/com/datadog/aiguard/MessageRedactorTest.java @@ -0,0 +1,636 @@ +package com.datadog.aiguard; + +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.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotSame; +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 datadog.trace.api.aiguard.AIGuard.ContentPart; +import datadog.trace.api.aiguard.AIGuard.Message; +import datadog.trace.api.aiguard.AIGuard.ToolCall; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.ValueSource; + +class MessageRedactorTest { + + private static final MessageRedactor REDACTOR = new MessageRedactor.DefaultRedactor(); + + private static Map replacement(final Object path, final Object replacement) { + final Map entry = new HashMap<>(2); + entry.put("path", path); + entry.put("replacement", replacement); + return entry; + } + + private static List messages(final Message... messages) { + return new ArrayList<>(asList(messages)); + } + + @Nested + class ContentString { + + @Test + void redactsPlainContent() { + final List messages = + messages( + Message.message("system", "You are a helpful assistant."), + Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[1].content", "My SSN is "))); + + assertTrue(result.redacted()); + assertEquals(1, result.applied); + assertEquals(0, result.skipped); + assertEquals("My SSN is ", result.messages.get(1).getContent()); + // the untouched message is shared, not rebuilt + assertSame(messages.get(0), result.messages.get(0)); + } + + @Test + void neverMutatesTheCallersMessages() { + final Message original = Message.message("user", "My SSN is 123-45-6789"); + final List messages = messages(original); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content", "My SSN is "))); + + assertNotSame(messages, result.messages); + assertEquals("My SSN is 123-45-6789", original.getContent()); + assertEquals("My SSN is 123-45-6789", messages.get(0).getContent()); + } + + @Test + void preservesRoleAndToolCallId() { + final List messages = messages(Message.tool("call_1", "Account 000123456789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content", "Account "))); + + final Message redacted = result.messages.get(0); + assertEquals("tool", redacted.getRole()); + assertEquals("call_1", redacted.getToolCallId()); + assertEquals("Account ", redacted.getContent()); + } + + @Test + void appliesEmptyReplacementBecauseItMeansRemoval() { + final List messages = messages(Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact(messages, singletonList(replacement("messages[0].content", ""))); + + assertTrue(result.redacted()); + assertEquals(0, result.skipped); + assertEquals("", result.messages.get(0).getContent()); + } + + @Test + void copiesReplacementVerbatimIncludingAstralPlaneCharacters() { + final String replacement = "🎭 👨‍👩‍👧‍👦 café"; + final List messages = + messages(Message.message("user", "🎭 123-45-6789 👨‍👩‍👧‍👦 café")); + + final MessageRedactor.Result result = + REDACTOR.redact(messages, singletonList(replacement("messages[0].content", replacement))); + + assertEquals(replacement, result.messages.get(0).getContent()); + } + } + + @Nested + class ContentParts { + + @Test + void redactsTextContentPart() { + final List messages = + messages( + Message.message( + "user", + asList( + ContentPart.text("here is my card 4111111111111111"), + ContentPart.imageUrl("https://example.com/image.jpg")))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement("messages[0].content[0].text", "here is my card "))); + + assertTrue(result.redacted()); + final List parts = result.messages.get(0).getContentParts(); + assertEquals("here is my card ", parts.get(0).getText()); + // the image part is untouched + assertEquals("https://example.com/image.jpg", parts.get(1).getImageUrl().getUrl()); + } + + @Test + void skipsImageUrlPart() { + final List messages = + messages( + Message.message( + "user", singletonList(ContentPart.imageUrl("https://example.com/image.jpg")))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content[0].text", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void skipsContentPartPathWhenMessageHoldsAPlainString() { + // messages[0].content[0].text has nothing to resolve against + final List messages = messages(Message.message("user", "plain content")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content[0].text", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void skipsContentPathWhenMessageHoldsContentParts() { + // messages[0].content resolves to a list, not a string + final List messages = + messages(Message.message("user", singletonList(ContentPart.text("secret")))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + } + + @Nested + class ToolCallArguments { + + @Test + void redactsToolCallArguments() { + final List messages = + messages( + Message.assistant( + ToolCall.toolCall("call_1", "send_email", "{\"ssn\":\"123-45-6789\"}"))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement( + "messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"\"}"))); + + assertTrue(result.redacted()); + final ToolCall toolCall = result.messages.get(0).getToolCalls().get(0); + assertEquals("call_1", toolCall.getId()); + assertEquals("send_email", toolCall.getFunction().getName()); + assertEquals("{\"ssn\":\"\"}", toolCall.getFunction().getArguments()); + } + + @Test + void skipsToolCallPathWhenMessageHasNoToolCalls() { + final List messages = messages(Message.message("user", "no tools here")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement("messages[0].tool_calls[0].function.arguments", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void skipsToolCallWhoseFunctionCarriesNoArguments() { + final List messages = + messages( + Message.assistant(new ToolCall("call_1", new ToolCall.Function("send_email", null)))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement("messages[0].tool_calls[0].function.arguments", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void redactsOnlyTheTargetedToolCall() { + final List messages = + messages( + Message.assistant( + ToolCall.toolCall("call_1", "a", "{\"x\":1}"), + ToolCall.toolCall("call_2", "b", "{\"ssn\":\"123-45-6789\"}"))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement( + "messages[0].tool_calls[1].function.arguments", "{\"ssn\":\"\"}"))); + + final List toolCalls = result.messages.get(0).getToolCalls(); + assertEquals("{\"x\":1}", toolCalls.get(0).getFunction().getArguments()); + assertEquals("{\"ssn\":\"\"}", toolCalls.get(1).getFunction().getArguments()); + } + + @Test + void preservesContentPartsWhenRedactingToolCallOnTheSameMessage() { + final Message message = + new Message( + "assistant", + singletonList(ContentPart.text("calling a tool")), + singletonList(ToolCall.toolCall("call_1", "send", "{\"ssn\":\"123-45-6789\"}")), + null); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages(message), + singletonList( + replacement( + "messages[0].tool_calls[0].function.arguments", "{\"ssn\":\"\"}"))); + + final Message redacted = result.messages.get(0); + assertNull(redacted.getContent()); + assertEquals("calling a tool", redacted.getContentParts().get(0).getText()); + assertEquals( + "{\"ssn\":\"\"}", redacted.getToolCalls().get(0).getFunction().getArguments()); + } + } + + @Nested + class MultipleReplacements { + + @Test + void appliesReplacementsAcrossSeveralMessages() { + final List messages = + messages( + Message.message("system", "contact ops@acme.io"), + Message.message("user", "My SSN is 123-45-6789"), + Message.message("assistant", "nothing sensitive here")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "contact "), + replacement("messages[1].content", "My SSN is "))); + + assertEquals(2, result.applied); + assertEquals("contact ", result.messages.get(0).getContent()); + assertEquals("My SSN is ", result.messages.get(1).getContent()); + assertSame(messages.get(2), result.messages.get(2)); + } + + @Test + void composesTwoReplacementsTargetingTheSameMessage() { + final Message message = + new Message( + "assistant", + asList( + ContentPart.text("card 4111111111111111"), ContentPart.text("ssn 123-45-6789")), + singletonList(ToolCall.toolCall("call_1", "send", "{\"email\":\"a@b.io\"}")), + null); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages(message), + asList( + replacement("messages[0].content[0].text", "card "), + replacement("messages[0].content[1].text", "ssn "), + replacement( + "messages[0].tool_calls[0].function.arguments", + "{\"email\":\"\"}"))); + + assertEquals(3, result.applied); + assertEquals(0, result.skipped); + final Message redacted = result.messages.get(0); + assertEquals("card ", redacted.getContentParts().get(0).getText()); + assertEquals("ssn ", redacted.getContentParts().get(1).getText()); + assertEquals( + "{\"email\":\"\"}", + redacted.getToolCalls().get(0).getFunction().getArguments()); + } + + @Test + void appliesSurvivorsWhenOneEntryIsUnresolvable() { + final List messages = messages(Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "My SSN is "), + replacement("messages[9].content", "never applied"))); + + assertEquals(1, result.applied); + assertEquals(1, result.skipped); + assertEquals("My SSN is ", result.messages.get(0).getContent()); + } + } + + @Nested + class AppliedReplacements { + + @Test + void reportsOnlyTheEntriesThatWereApplied() { + final List messages = messages(Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "My SSN is "), + replacement("messages[9].content", "never applied"))); + + assertEquals(1, result.applied); + assertEquals(1, result.skipped); + } + + @Test + void keepsAnEmptyReplacementWhichMeansRemove() { + final List messages = messages(Message.message("user", "SSN 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact(messages, singletonList(replacement("messages[0].content", ""))); + + assertEquals(1, result.applied); + assertEquals("", result.messages.get(0).getContent()); + } + + @Test + void reportsNothingWhenNothingWasApplied() { + final List messages = messages(Message.message("user", "hello")); + + assertEquals(0, REDACTOR.redact(messages, null).applied); + assertEquals(0, new MessageRedactor.NoOp().redact(messages, null).applied); + } + } + + @Nested + class MalformedResponses { + + @Test + void returnsSameListWhenReplacementsAreNull() { + final List messages = messages(Message.message("user", "hello")); + + final MessageRedactor.Result result = REDACTOR.redact(messages, null); + + assertSame(messages, result.messages); + assertFalse(result.redacted()); + assertEquals(0, result.skipped); + } + + @Test + void returnsSameListWhenReplacementsAreEmpty() { + final List messages = messages(Message.message("user", "hello")); + + final MessageRedactor.Result result = REDACTOR.redact(messages, Collections.emptyList()); + + assertSame(messages, result.messages); + assertFalse(result.redacted()); + } + + @Test + void returnsSameListWhenThereAreNoMessages() { + final MessageRedactor.Result nullMessages = + REDACTOR.redact(null, singletonList(replacement("messages[0].content", ""))); + assertNull(nullMessages.messages); + assertFalse(nullMessages.redacted()); + + final List empty = Collections.emptyList(); + final MessageRedactor.Result noMessages = + REDACTOR.redact(empty, singletonList(replacement("messages[0].content", ""))); + assertSame(empty, noMessages.messages); + assertFalse(noMessages.redacted()); + } + + @Test + void skipsEveryPathTheServiceContradictsItselfOn() { + final List messages = + messages( + Message.message("system", "contact ops@acme.io"), + Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "first"), + replacement("messages[0].content", "second"), + replacement("messages[1].content", "third"), + replacement("messages[1].content", "fourth"))); + + assertFalse(result.redacted()); + assertEquals(2, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void skipsConflictingReplacementsForTheSamePath() { + final List messages = messages(Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "first"), + replacement("messages[0].content", "second"))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + assertEquals("My SSN is 123-45-6789", messages.get(0).getContent()); + } + + @Test + void acceptsDuplicateReplacementsCarryingTheSameValue() { + final List messages = messages(Message.message("user", "My SSN is 123-45-6789")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement("messages[0].content", "My SSN is "), + replacement("messages[0].content", "My SSN is "))); + + assertEquals(1, result.applied); + assertEquals(0, result.skipped); + assertEquals("My SSN is ", result.messages.get(0).getContent()); + } + + @Test + void skipsEntriesThatAreNotObjects() { + final List messages = messages(Message.message("user", "hello")); + + final MessageRedactor.Result result = REDACTOR.redact(messages, asList("not an object", 42)); + + assertFalse(result.redacted()); + assertEquals(2, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void skipsEntriesWithMissingOrNonStringFields() { + final List messages = messages(Message.message("user", "hello")); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + asList( + replacement(null, ""), + replacement("messages[0].content", null), + replacement("", ""), + replacement(42, ""), + replacement("messages[0].content", 42), + new HashMap())); + + assertFalse(result.redacted()); + assertEquals(6, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void neverThrowsOnAToolCallWithoutAFunction() { + final List messages = + messages( + new Message( + "assistant", (String) null, singletonList(new ToolCall("call_1", null)), null)); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, + singletonList( + replacement("messages[0].tool_calls[0].function.arguments", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + } + + @Test + void skipsContentPathOnAMessageWithoutContent() { + final List messages = + messages(Message.assistant(ToolCall.toolCall("call_1", "send", "{}"))); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[0].content", ""))); + + assertFalse(result.redacted()); + assertEquals(1, result.skipped); + } + } + + @Nested + class PathGrammar { + + @ParameterizedTest + @ValueSource( + strings = { + "", // empty path + "content", // not rooted at messages + "messages", // resolves to the list itself + "messages.content", // missing root index + "messages[0]", // resolves to a message, not a string + "messages[0].foo", // unknown field + "messages[0].content.text", // missing part index + "messages[0].content[0]", // resolves to a content part + "messages[0].content[0].foo", // unknown content part field + "messages[0].content[0].text.extra", // too deep + "messages[0].content[1].image_url.url", // image locator, out of scope + "messages[0].tool_calls.function.arguments", // missing tool call index + "messages[0].tool_calls[0].function", // resolves to a function + "messages[0].tool_calls[0].function.name", // not a redactable target + "messages[0].tool_calls[0].arguments", // missing function hop + "messages[-1].content", // negative index rejected by the segment regex + "messages[0].content ", // trailing space, whole segment must match + " messages[0].content", // leading space + "messages[0]..content", // empty segment + "messages[0].content[", // unbalanced bracket + "messages[0].con-tent", // hyphen is not a word character + "messages[99999999999].content", // index overflows + "messages[0].tool_calls[0].function.arguments.extra", // deeper than any target + "conversation[0].content", // rooted at something other than messages + "messages[0].content[0].text[0]", // an index on the text field itself + "messages[0].content[9].text", // content part index out of range + "messages[0].tool_calls[0].foo.arguments", // the hop is not `function` + "messages[0].tool_calls[0].function[0].arguments", // an index on `function` + "messages[0].tool_calls[0].function.arguments[0]", // an index on `arguments` + "messages[0].tool_calls[9].function.arguments" // tool call index out of range + }) + void skipsUnsupportedPaths(final String path) { + final List messages = + messages( + new Message( + "assistant", + asList( + ContentPart.text("text"), ContentPart.imageUrl("https://example.com/i.jpg")), + singletonList(ToolCall.toolCall("call_1", "send", "{}")), + null)); + + final MessageRedactor.Result result = + REDACTOR.redact(messages, singletonList(replacement(path, ""))); + + assertFalse(result.redacted(), "expected path to be skipped: " + path); + assertEquals(1, result.skipped); + assertSame(messages, result.messages); + } + + @Test + void acceptsMultiDigitIndexes() { + final List messages = new ArrayList<>(); + for (int i = 0; i < 12; i++) { + messages.add(Message.message("user", "message " + i)); + } + + final MessageRedactor.Result result = + REDACTOR.redact( + messages, singletonList(replacement("messages[11].content", ""))); + + assertTrue(result.redacted()); + assertEquals("", result.messages.get(11).getContent()); + } + + @Test + void toleratesUnknownKeysOnAReplacementEntry() { + final Map entry = new LinkedHashMap<>(); + entry.put("path", "messages[0].content"); + entry.put("replacement", ""); + entry.put("category", "ssn"); + + final MessageRedactor.Result result = + REDACTOR.redact( + messages(Message.message("user", "My SSN is 123-45-6789")), singletonList(entry)); + + assertTrue(result.redacted()); + assertEquals("", result.messages.get(0).getContent()); + } + } +} diff --git a/dd-java-agent/agent-bootstrap/gradle.lockfile b/dd-java-agent/agent-bootstrap/gradle.lockfile index d63475bb2f1..374b4e97585 100644 --- a/dd-java-agent/agent-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-bootstrap/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java index 99c7cb700e1..d749dd4c372 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/api/Java8BytecodeBridge.java @@ -1,6 +1,7 @@ package datadog.trace.bootstrap.instrumentation.api; import datadog.context.Context; +import datadog.context.ContextScope; /** * A helper for accessing methods that rely on new Java 8 bytecode features such as calling a static @@ -38,6 +39,13 @@ public static AgentSpan spanFromContext(Context context) { return AgentSpan.fromContext(context); } + /** + * @see AgentSpan#fromScope(ContextScope) + */ + public static AgentSpan spanFromScope(ContextScope scope) { + return AgentSpan.fromScope(scope); + } + /** * @see Baggage#fromContext(Context) */ 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 ccd3bad8505..3bf071997b1 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 @@ -83,20 +83,32 @@ public static boolean containsTraceComment(String sql, int from, int to) { public static String buildComment( String dbService, String dbType, String hostname, String dbName, String traceParent) { ensureStaticPrefixComputed(); - - // we can calculate the precise size - having a rough estimation is perhaps faster - StringBuilder sb = new StringBuilder(1024).append(staticPrefix); - int initSize = 0; // No initial content for pure comment - append(sb, DATABASE_SERVICE, dbService, initSize); - append(sb, DD_HOSTNAME, hostname, initSize); - append(sb, DD_DB_NAME, dbName, initSize); - append(sb, DD_PEER_SERVICE, getPeerService(), initSize); - append(sb, TRACEPARENT, traceParent, initSize); - final Config config = Config.get(); - if (config.isDbmInjectSqlBaseHash() && config.isExperimentalPropagateProcessTagsEnabled()) { - append(sb, DD_SERVICE_HASH, BaseHash.getBaseHashStr(), initSize); - } - + String service = encode(dbService); + String host = encode(hostname); + String database = encode(dbName); + String peerService = encode(getPeerService()); + String parent = encode(traceParent); + Config config = Config.get(); + String serviceHash = + config.isDbmInjectSqlBaseHash() && config.isExperimentalPropagateProcessTagsEnabled() + ? encode(BaseHash.getBaseHashStr()) + : null; + long capacity = + staticPrefix.length() + + fieldSize(DATABASE_SERVICE, service) + + fieldSize(DD_HOSTNAME, host) + + fieldSize(DD_DB_NAME, database) + + fieldSize(DD_PEER_SERVICE, peerService) + + fieldSize(TRACEPARENT, parent) + + fieldSize(DD_SERVICE_HASH, serviceHash); + StringBuilder sb = + new StringBuilder((int) Math.min(capacity, Integer.MAX_VALUE)).append(staticPrefix); + appendEncoded(sb, DATABASE_SERVICE, service); + appendEncoded(sb, DD_HOSTNAME, host); + appendEncoded(sb, DD_DB_NAME, database); + appendEncoded(sb, DD_PEER_SERVICE, peerService); + appendEncoded(sb, TRACEPARENT, parent); + appendEncoded(sb, DD_SERVICE_HASH, serviceHash); return sb.length() > 0 ? sb.toString() : null; } @@ -107,9 +119,9 @@ private static void ensureStaticPrefixComputed() { Config config = Config.get(); final StringBuilder sb = new StringBuilder(512); // big enough not to be resized - append(sb, PARENT_SERVICE, config.getServiceName(), 0); - append(sb, DD_ENV, config.getEnv(), 0); - append(sb, DD_VERSION, config.getVersion(), 0); + appendEncoded(sb, PARENT_SERVICE, encode(config.getServiceName())); + appendEncoded(sb, DD_ENV, encode(config.getEnv())); + appendEncoded(sb, DD_VERSION, encode(config.getVersion())); staticPrefix = sb.toString(); staticPrefixComputed = true; } @@ -130,6 +142,9 @@ private static String getPeerService() { } private static String encode(String val) { + if (val == null || val.isEmpty()) { + return null; + } try { return URLEncoder.encode(val, UTF8); } catch (UnsupportedEncodingException exe) { @@ -140,19 +155,18 @@ private static String encode(String val) { return val; } - private static void append(StringBuilder sb, String key, String value, int initSize) { - if (null == value || value.isEmpty()) { + /** Includes a possible separator, equals sign and quotes for a nonempty encoded field. */ + private static long fieldSize(String key, String value) { + return value == null ? 0 : (long) key.length() + value.length() + 4; + } + + private static void appendEncoded(StringBuilder sb, String key, String value) { + if (value == null) { return; } - String encodedValue; - try { - encodedValue = URLEncoder.encode(value, UTF8); - } catch (UnsupportedEncodingException e) { - encodedValue = value; - } - if (sb.length() > initSize) { + if (sb.length() > 0) { sb.append(COMMA); } - sb.append(key).append(EQUALS).append(QUOTE).append(encodedValue).append(QUOTE); + sb.append(key).append(EQUALS).append(QUOTE).append(value).append(QUOTE); } } 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 c72533768ef..5c6628c5d35 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 @@ -10,7 +10,6 @@ import datadog.trace.api.Functions; import datadog.trace.api.TagMap; import datadog.trace.api.cache.QualifiedClassNameCache; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.ErrorPriorities; import datadog.trace.bootstrap.instrumentation.api.Tags; @@ -148,12 +147,6 @@ public final void beforeFinish(final Context context) { protected void doBeforeFinish(final Context context) {} - public final void onError(@Nullable final AgentScope scope, @Nullable final Throwable throwable) { - if (scope != null) { - onError(scope.span(), throwable); - } - } - public final void onError(@Nullable final AgentSpan span, @Nullable final Throwable throwable) { onError(span, throwable, ErrorPriorities.DEFAULT); } diff --git a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java index 2f77a3fb4bf..06eb51c50a1 100644 --- a/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java +++ b/dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/java/concurrent/QueueTimerHelper.java @@ -29,6 +29,12 @@ private static final class RateLimiterHolder { ProfilingConfig.PROFILING_UPLOAD_PERIOD_DEFAULT))); } + /** Whether queue timing can safely start. */ + public static boolean isReady() { + // Queue timing is unsupported in native images. JFR must initialise the TSC frequency first. + return !Platform.isNativeImage() && InstrumentationBasedProfiling.isJFRReady(); + } + public static void startQueuingTimer( ContextStore taskContextStore, Class schedulerClass, @@ -41,14 +47,8 @@ public static void startQueuingTimer( public static void startQueuingTimer( State state, Class schedulerClass, Class queueClass, int queueLength, Object task) { - if (Platform.isNativeImage()) { - // explicitly not supported for Graal native image - return; - } // TODO consider queue length based sampling here to reduce overhead - // avoid calling this before JFR is initialised because it will lead to reading the wrong - // TSC frequency before JFR has set it up properly - if (task != null && state != null && InstrumentationBasedProfiling.isJFRReady()) { + if (task != null && state != null && isReady()) { QueueTiming timing = (QueueTiming) AgentTracer.get().getProfilingContext().start(Timer.TimerType.QUEUEING); timing.setTask(task); 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 e406889d260..fcd598f8ba1 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,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy index 58a7aa1d13a..8d3e63f5ae2 100644 --- a/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy +++ b/dd-java-agent/agent-ci-visibility/civisibility-instrumentation-test-fixtures/src/main/groovy/datadog/trace/civisibility/CiVisibilityInstrumentationTest.groovy @@ -81,6 +81,14 @@ abstract class CiVisibilityInstrumentationTest extends InstrumentationSpecificat Files.deleteIfExists(AGENT_KEY_FILE) } + protected boolean flakyRetryOnlyKnownFlakes() { + true + } + + protected String testOrder() { + CIConstants.FAIL_FAST_TEST_ORDER + } + @Override void configurePreAgent() { super.configurePreAgent() @@ -92,10 +100,14 @@ abstract class CiVisibilityInstrumentationTest extends InstrumentationSpecificat injectSysConfig(CiVisibilityConfig.CIVISIBILITY_AGENTLESS_ENABLED, "true") injectSysConfig(CiVisibilityConfig.CIVISIBILITY_ITR_ENABLED, "true") injectSysConfig(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ENABLED, "true") + injectSysConfig(CiVisibilityConfig.CIVISIBILITY_FLAKY_RETRY_ONLY_KNOWN_FLAKES, flakyRetryOnlyKnownFlakes().toString()) injectSysConfig(CiVisibilityConfig.CIVISIBILITY_EARLY_FLAKE_DETECTION_LOWER_LIMIT, "1") injectSysConfig(CiVisibilityConfig.TEST_MANAGEMENT_ENABLED, "true") injectSysConfig(CiVisibilityConfig.TEST_MANAGEMENT_ATTEMPT_TO_FIX_RETRIES, "5") - injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, CIConstants.FAIL_FAST_TEST_ORDER) + def testOrder = testOrder() + if (testOrder != null) { + injectSysConfig(CiVisibilityConfig.CIVISIBILITY_TEST_ORDER, testOrder) + } } @SuppressWarnings('UnusedPrivateField') 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 078fa548268..b5d38f8d285 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,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 7ec847e9787..837e03e0d41 100644 --- a/dd-java-agent/agent-ci-visibility/gradle.lockfile +++ b/dd-java-agent/agent-ci-visibility/gradle.lockfile @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,compileOnlyDependenciesMetadata,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileOnlyDependenciesMetadata,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.code.gson:gson:2.14.0=spotbugs @@ -134,7 +134,6 @@ 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.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java index 072acd021ab..006deb428be 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/config/api/dto/response/TestIdentifierJson.java @@ -19,7 +19,7 @@ public final class TestIdentifierJson { private final String parameters; private final Configurations configurations; - @Json(name = "_missing_line_code_coverage") + @Json(name = "_is_missing_line_code_coverage") private final boolean missingLineCodeCoverage; public TestIdentifierJson( diff --git a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java index dc89fbe7d97..660516056a1 100644 --- a/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java +++ b/dd-java-agent/agent-ci-visibility/src/main/java/datadog/trace/civisibility/test/ExecutionStrategy.java @@ -158,7 +158,8 @@ private boolean isAutoRetryApplicable(TestIdentifier test) { return false; } - return (!executionSettings.isFlakyTestsDataAvailable() + return (!config.isCiVisibilityFlakyRetryOnlyKnownFlakes() + || !executionSettings.isFlakyTestsDataAvailable() || executionSettings.isFlaky(test.toFQN())) && autoRetriesUsed.get() < config.getCiVisibilityTotalFlakyRetryCount(); } diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy index e01e57315fc..773030e16c4 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/test/ExecutionStrategyTest.groovy @@ -12,6 +12,8 @@ import datadog.trace.civisibility.config.EarlyFlakeDetectionSettings import datadog.trace.civisibility.config.ExecutionSettings import datadog.trace.civisibility.config.TestManagementSettings import datadog.trace.civisibility.execution.AttemptToFix +import datadog.trace.civisibility.execution.AutoTestRetry +import datadog.trace.civisibility.execution.Regular import datadog.trace.civisibility.source.LinesResolver import datadog.trace.civisibility.source.SourcePathResolver import spock.lang.Specification @@ -78,6 +80,36 @@ class ExecutionStrategyTest extends Specification { strategy.executionPolicy(testID, TestSourceData.UNKNOWN, []).class == AttemptToFix } + def "test ATR applicability when retry only known flakes is #retryOnlyKnownFlakes, flaky data available is #flakyDataAvailable, and test is known flaky is #knownFlaky"() { + setup: + def testFQN = new TestFQN("suite", "name") + def testID = new TestIdentifier(testFQN, null) + + def config = Stub(Config) + config.isCiVisibilityFlakyRetryOnlyKnownFlakes() >> retryOnlyKnownFlakes + config.getCiVisibilityFlakyRetryCount() >> 5 + config.getCiVisibilityTotalFlakyRetryCount() >> 100 + + def executionSettings = Stub(ExecutionSettings) + executionSettings.getTestManagementSettings() >> TestManagementSettings.DEFAULT + executionSettings.getEarlyFlakeDetectionSettings() >> EarlyFlakeDetectionSettings.DEFAULT + executionSettings.isFlakyTestRetriesEnabled() >> true + executionSettings.isFlakyTestsDataAvailable() >> flakyDataAvailable + executionSettings.isFlaky(testFQN) >> knownFlaky + + def strategy = givenAnExecutionStrategy(executionSettings, config) + + expect: + strategy.executionPolicy(testID, TestSourceData.UNKNOWN, []).class == expectedPolicy + + where: + retryOnlyKnownFlakes | flakyDataAvailable | knownFlaky | expectedPolicy + false | true | false | AutoTestRetry + true | true | false | Regular + true | true | true | AutoTestRetry + true | false | false | AutoTestRetry + } + def "test attempt to fix + efd"() { setup: def testFQN = new TestFQN("suite", "name") @@ -117,8 +149,9 @@ class ExecutionStrategyTest extends Specification { secondOutcome.retryReason() == RetryReason.attemptToFix } - private ExecutionStrategy givenAnExecutionStrategy(ExecutionSettings executionSettings = ExecutionSettings.EMPTY) { - def config = Config.get() + private ExecutionStrategy givenAnExecutionStrategy( + ExecutionSettings executionSettings = ExecutionSettings.EMPTY, + Config config = Config.get()) { def resolver = Stub(SourcePathResolver) def linesResolver = Stub(LinesResolver) diff --git a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/utils/ShellCommandExecutorTest.groovy b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/utils/ShellCommandExecutorTest.groovy index 5b9dd7527ba..5e3323f5365 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/utils/ShellCommandExecutorTest.groovy +++ b/dd-java-agent/agent-ci-visibility/src/test/groovy/datadog/trace/civisibility/utils/ShellCommandExecutorTest.groovy @@ -1,6 +1,7 @@ package datadog.trace.civisibility.utils import datadog.communication.util.IOUtils +import datadog.trace.test.util.PortableCommand import spock.lang.Specification import spock.lang.TempDir @@ -18,7 +19,7 @@ class ShellCommandExecutorTest extends Specification { def shellCommandExecutor = new ShellCommandExecutor(temporaryFolder, SHELL_COMMAND_TIMEOUT) when: - def output = shellCommandExecutor.executeCommand(IOUtils::readFully, "echo", "this is a test") + def output = shellCommandExecutor.executeCommand(IOUtils::readFully, *PortableCommand.echo("this is a test")) then: output.trim() == "this is a test" @@ -29,7 +30,7 @@ class ShellCommandExecutorTest extends Specification { def shellCommandExecutor = new ShellCommandExecutor(temporaryFolder, SHELL_COMMAND_TIMEOUT) when: - def output = shellCommandExecutor.executeCommand(IOUtils::readFully, "this is a test".bytes, "cat") + def output = shellCommandExecutor.executeCommand(IOUtils::readFully, "this is a test".bytes, *PortableCommand.cat()) then: output.trim() == "this is a test" @@ -40,7 +41,7 @@ class ShellCommandExecutorTest extends Specification { def shellCommandExecutor = new ShellCommandExecutor(temporaryFolder, 1_000) when: - shellCommandExecutor.executeCommand(IOUtils::readFully, "sleep", "2") + shellCommandExecutor.executeCommand(IOUtils::readFully, *PortableCommand.sleep(2)) then: thrown TimeoutException diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response-one-module.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response-one-module.ftl index a8a6bcf119c..9f8734c8ae7 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response-one-module.ftl +++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response-one-module.ftl @@ -12,7 +12,7 @@ "suite": "suite-a", "name": "name-a", "parameters": "parameters-a", - "_missing_line_code_coverage": true + "_is_missing_line_code_coverage": true } }, { @@ -26,7 +26,7 @@ }, "suite": "suite-b", "name": "name-b", - "_missing_line_code_coverage": true + "_is_missing_line_code_coverage": true } } ], diff --git a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response.ftl b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response.ftl index 007ca52c5d8..cc4e2f7c2d1 100644 --- a/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response.ftl +++ b/dd-java-agent/agent-ci-visibility/src/test/resources/datadog/trace/civisibility/config/skippable-response.ftl @@ -13,7 +13,7 @@ "suite": "suite-a", "name": "name-a", "parameters": "parameters-a", - "_missing_line_code_coverage": true + "_is_missing_line_code_coverage": true } }, { @@ -28,7 +28,7 @@ }, "suite": "suite-b", "name": "name-b", - "_missing_line_code_coverage": false + "_is_missing_line_code_coverage": false } } ], diff --git a/dd-java-agent/agent-crashtracking/gradle.lockfile b/dd-java-agent/agent-crashtracking/gradle.lockfile index bee584aa764..f04e312692f 100644 --- a/dd-java-agent/agent-crashtracking/gradle.lockfile +++ b/dd-java-agent/agent-crashtracking/gradle.lockfile @@ -8,6 +8,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -24,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -86,7 +87,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile index 7131b5408a3..32642d300d4 100644 --- a/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-bootstrap/gradle.lockfile @@ -7,8 +7,8 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -54,7 +54,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile index 826ff1915ca..35f9881166a 100644 --- a/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-el/gradle.lockfile @@ -7,8 +7,8 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 398c916a3c7..7a05b9635e4 100644 --- a/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile +++ b/dd-java-agent/agent-debugger/debugger-test-scala/gradle.lockfile @@ -9,8 +9,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -69,7 +69,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-debugger/gradle.lockfile b/dd-java-agent/agent-debugger/gradle.lockfile index 9e69399ae98..3fbbb5e2f63 100644 --- a/dd-java-agent/agent-debugger/gradle.lockfile +++ b/dd-java-agent/agent-debugger/gradle.lockfile @@ -36,8 +36,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -121,7 +121,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testFixtur org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java index a00a93d268e..23b49fe57cc 100644 --- a/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java +++ b/dd-java-agent/agent-debugger/src/main/java/com/datadog/debugger/agent/DebuggerTracer.java @@ -3,9 +3,9 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.NOOP_TRACER; import com.datadog.debugger.sink.ProbeStatusSink; +import datadog.context.ContextScope; import datadog.trace.bootstrap.debugger.DebuggerContext; import datadog.trace.bootstrap.debugger.DebuggerSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -38,19 +38,19 @@ public DebuggerSpan createSpan(String encodedProbeId, String resourceName, Strin dynamicSpan.setTag(tag.substring(0, idx), tag.substring(idx + 1)); } } - AgentScope scope = tracerAPI.activateManualSpan(dynamicSpan); + ContextScope scope = tracerAPI.activateManualSpan(dynamicSpan); return new DebuggerSpanImpl(dynamicSpan, scope, probeStatusSink, encodedProbeId); } static class DebuggerSpanImpl implements DebuggerSpan { final AgentSpan underlyingSpan; - final AgentScope currentScope; + final ContextScope currentScope; final ProbeStatusSink probeStatusSink; final String encodedProbeId; public DebuggerSpanImpl( AgentSpan underlyingSpan, - AgentScope currentScope, + ContextScope currentScope, ProbeStatusSink probeStatusSink, String encodedProbeId) { this.underlyingSpan = underlyingSpan; diff --git a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java index 4477078add2..a0f24c7f1ab 100644 --- a/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java +++ b/dd-java-agent/agent-debugger/src/test/java/com/datadog/debugger/agent/DebuggerTracerTest.java @@ -38,9 +38,11 @@ public void createSpan() { assertEquals(0, underlyingSpan.getDurationNano()); assertEquals( "dd.dynamic.span", - ((DebuggerTracer.DebuggerSpanImpl) span).currentScope.span().getSpanName()); + AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope).getSpanName()); assertEquals( - "a-span", ((DebuggerTracer.DebuggerSpanImpl) span).currentScope.span().getResourceName()); + "a-span", + AgentSpan.fromScope(((DebuggerTracer.DebuggerSpanImpl) span).currentScope) + .getResourceName()); span.finish(); assertNotEquals(0, underlyingSpan.getDurationNano()); verify(probeStatusSink).addEmitting(eq(SPAN_ID.getEncodedId())); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot29.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot29.java index 246b7791b6a..c3402a9c86a 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot29.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CapturedSnapshot29.java @@ -1,7 +1,7 @@ package com.datadog.debugger; import datadog.trace.agent.tooling.TracerInstaller; -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.core.CoreTracer; diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin01.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin01.java index 986f26494b9..0efbd50863b 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin01.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin01.java @@ -2,7 +2,7 @@ import com.datadog.debugger.origin.CodeOrigin; import datadog.trace.bootstrap.debugger.DebuggerContext; -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.AgentTracer.TracerAPI; @@ -18,7 +18,7 @@ public class CodeOrigin01 { public static int main(String arg) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); marker(); captureCodeOrigin(CodeOrigin01.class.getDeclaredMethod("main", String.class), true); if (arg.equals("debug_1")) { @@ -38,7 +38,7 @@ public static int main(String arg) throws ReflectiveOperationException { @CodeOrigin public static void fullTrace() throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); entry(); span.finish(); scope.close(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin02.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin02.java index 0858edd5d34..9b60cfc17b3 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin02.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin02.java @@ -1,7 +1,7 @@ package com.datadog.debugger; import datadog.trace.bootstrap.debugger.DebuggerContext; -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.AgentTracer.TracerAPI; @@ -14,7 +14,7 @@ public class CodeOrigin02 { public static int main(String arg) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); if (arg.equals("debug_1")) { ((DDSpan) span.getLocalRootSpan()).setTag("_dd.p.debug", "1"); } else if (arg.equals("debug_0")) { @@ -31,7 +31,7 @@ public static int main(String arg) throws ReflectiveOperationException { private static void fullTrace() throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); entry(); span.finish(); scope.close(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin03.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin03.java index 42d2949694e..e40dd4a9101 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin03.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin03.java @@ -1,7 +1,7 @@ package com.datadog.debugger; import datadog.trace.bootstrap.debugger.DebuggerContext; -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.AgentTracer.TracerAPI; @@ -16,7 +16,7 @@ public class CodeOrigin03 { public static int main(String arg) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); if (arg.equals("debug_1")) { ((DDSpan) span.getLocalRootSpan()).setTag("_dd.p.debug", "1"); } else if (arg.equals("debug_0")) { @@ -33,7 +33,7 @@ public static int main(String arg) throws ReflectiveOperationException { private static void fullTrace() throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); marker(); DebuggerContext.captureCodeOrigin(true); entry(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin04.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin04.java index ad67ae8341e..b0daecf58a1 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin04.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin04.java @@ -1,6 +1,6 @@ package com.datadog.debugger; -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.AgentTracer.TracerAPI; @@ -21,7 +21,7 @@ private static void doExit(int level) { doExit(level - 1); } else { AgentSpan span; - AgentScope scope; + ContextScope scope; span = newSpan("exit"); scope = tracerAPI.activateManualSpan(span); exit(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin05.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin05.java index 341d8391736..aa3fedfbfd9 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin05.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/CodeOrigin05.java @@ -1,6 +1,6 @@ package com.datadog.debugger; -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.AgentTracer.TracerAPI; @@ -13,7 +13,7 @@ public class CodeOrigin05 { public static int main(String arg) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); if (arg.equals("debug_1")) { ((DDSpan) span.getLocalRootSpan()).setTag("_dd.p.debug", "1"); } else if (arg.equals("debug_0")) { @@ -30,7 +30,7 @@ public static int main(String arg) throws ReflectiveOperationException { private static void fullTrace() throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); entry(); span.finish(); scope.close(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe01.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe01.java index 73cc5f843b0..25a5b84bb60 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe01.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe01.java @@ -1,6 +1,6 @@ package com.datadog.debugger; -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.AgentTracer.TracerAPI; @@ -12,7 +12,7 @@ public class TriggerProbe01 { public static int main(String arg) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); fullTrace(); @@ -24,7 +24,7 @@ public static int main(String arg) throws ReflectiveOperationException { private static void fullTrace() throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); entry(); span.finish(); scope.close(); diff --git a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe02.java b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe02.java index 2e200c10727..60ccbd364d1 100644 --- a/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe02.java +++ b/dd-java-agent/agent-debugger/src/test/resources/com/datadog/debugger/TriggerProbe02.java @@ -1,6 +1,6 @@ package com.datadog.debugger; -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.AgentTracer.TracerAPI; @@ -12,7 +12,7 @@ public class TriggerProbe02 { public static int main(Integer value) throws ReflectiveOperationException { AgentSpan span = newSpan("main"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); fullTrace(value); @@ -24,7 +24,7 @@ public static int main(Integer value) throws ReflectiveOperationException { private static void fullTrace(int value) throws NoSuchMethodException { AgentSpan span = newSpan("entry"); - AgentScope scope = tracerAPI.activateManualSpan(span); + ContextScope scope = tracerAPI.activateManualSpan(span); entry(value); span.finish(); scope.close(); diff --git a/dd-java-agent/agent-iast/gradle.lockfile b/dd-java-agent/agent-iast/gradle.lockfile index 6e3ff7e0142..7bd61b544d8 100644 --- a/dd-java-agent/agent-iast/gradle.lockfile +++ b/dd-java-agent/agent-iast/gradle.lockfile @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,compileProtoPath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=jmhRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.0.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -129,7 +129,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testCompileProtoPath,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 d8b60a884ed..f92dc0d0eb7 100644 --- a/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile +++ b/dd-java-agent/agent-iast/iast-test-fixtures/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -93,7 +93,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java index d6f0a7e7b90..a2b152b1a90 100644 --- a/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java +++ b/dd-java-agent/agent-iast/src/jmh/java/com/datadog/iast/propagation/AbstractBenchmark.java @@ -6,12 +6,12 @@ import com.datadog.iast.model.Range; import com.datadog.iast.model.Source; import com.datadog.iast.taint.TaintedObjects; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.ProductActivation; import datadog.trace.api.gateway.InstrumentationGateway; import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.iast.IastContext; -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.TagContext; @@ -44,7 +44,7 @@ public abstract class AbstractBenchmark> ctx diff --git a/dd-java-agent/agent-installer/gradle.lockfile b/dd-java-agent/agent-installer/gradle.lockfile index 3e05a012bb8..39bc4e43969 100644 --- a/dd-java-agent/agent-installer/gradle.lockfile +++ b/dd-java-agent/agent-installer/gradle.lockfile @@ -30,8 +30,8 @@ com.github.jnr:jnr-posix:3.1.22=testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.36=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-jmxfetch/gradle.lockfile b/dd-java-agent/agent-jmxfetch/gradle.lockfile index 16756f4559e..0b89dccfadc 100644 --- a/dd-java-agent/agent-jmxfetch/gradle.lockfile +++ b/dd-java-agent/agent-jmxfetch/gradle.lockfile @@ -17,8 +17,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -64,7 +64,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-llmobs/gradle.lockfile b/dd-java-agent/agent-llmobs/gradle.lockfile index 16a26c82c82..d491cd7770d 100644 --- a/dd-java-agent/agent-llmobs/gradle.lockfile +++ b/dd-java-agent/agent-llmobs/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -93,7 +93,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 473d118cdc3..d9366fcd19c 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 @@ -12,7 +12,6 @@ import datadog.trace.api.llmobs.LLMObsSpan; import datadog.trace.api.llmobs.LLMObsTags; import datadog.trace.api.telemetry.LLMObsMetricCollector; -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; @@ -43,7 +42,7 @@ public class DDLLMObsSpan implements LLMObsSpan { private static final String SPAN_KIND = LLMOBS_TAG_PREFIX + Tags.SPAN_KIND; private static final String METADATA = LLMOBS_TAG_PREFIX + LLMObsTags.METADATA; private static final String TOOL_DEFINITIONS = LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS; - private static final String AGENT_MANIFEST = LLMOBS_TAG_PREFIX + LLMObsTags.AGENT_MANIFEST; + private static final String METADATA_DD = "_dd"; private static final String MANUAL_FRAMEWORK = "manual"; private static final String PROMPT_TRACKING_INSTRUMENTATION_METHOD = LLMOBS_TAG_PREFIX + "prompt_tracking_instrumentation_method"; @@ -77,7 +76,7 @@ public class DDLLMObsSpan implements LLMObsSpan { // Non-null only for agent-kind spans started without an ambient APM root. Activating the // agent's APM span keeps children in the same APM trace so the trace-ID gate passes and // they inherit agent attribution correctly. - private final AgentScope standaloneApmScope; + private final ContextScope standaloneApmScope; private boolean finished = false; @@ -417,16 +416,19 @@ public void annotateAgentManifest(LLMObs.AgentManifest manifest) { "dropping agent manifest on non-agent span kind; annotateAgentManifest is only supported for agent spans"); return; } - // Read existing manifest (may be null on first call) - Object existing = span.getTag(AGENT_MANIFEST); - @SuppressWarnings("unchecked") - Map base = - (existing instanceof Map) - ? new LinkedHashMap<>((Map) existing) - : new LinkedHashMap<>(); + // The manifest rides inside metadata under the reserved _dd namespace, serializing to + // meta.metadata._dd.agent_manifest + Map metadata = copyStringKeyedMap(span.getTag(METADATA)); + Map dd = copyStringKeyedMap(metadata.get(METADATA_DD)); + // Empty on the first call; merges with itself on subsequent ones. + Map base = copyStringKeyedMap(dd.get(LLMObsTags.AGENT_MANIFEST)); + mergeManifest(base, manifest); base.put("framework", MANUAL_FRAMEWORK); - span.setTag(AGENT_MANIFEST, base); + + dd.put(LLMObsTags.AGENT_MANIFEST, base); + metadata.put(METADATA_DD, dd); + span.setTag(METADATA, metadata); // Sync pagent name to the manifest name so the serializer emits the manifest name in // agent_attribution. The manifest name takes priority over the span name set at construction. @@ -491,6 +493,13 @@ private void mergeManifest(Map base, LLMObs.AgentManifest manife } } + /** Copies {@code source} if it is a map, else returns an empty mutable map. */ + private static Map copyStringKeyedMap(Object source) { + return source instanceof Map + ? copyStringKeyedMap((Map) source) + : new LinkedHashMap(); + } + private static Map copyStringKeyedMap(Map source) { Map copy = new LinkedHashMap<>(); for (Map.Entry entry : source.entrySet()) { @@ -558,7 +567,15 @@ public void setMetadata(Map metadata) { if (value instanceof Map) { Map mergedMetadata = copyStringKeyedMap((Map) value); + // Reserved entries already under _dd, such as the agent manifest, must survive a later + // annotation: putAll would replace the whole _dd map if the caller supplies one, so merge + // that namespace key by key instead, letting the caller win per key. + Map reservedDd = copyStringKeyedMap(mergedMetadata.get(METADATA_DD)); mergedMetadata.putAll(metadata); + if (!reservedDd.isEmpty()) { + reservedDd.putAll(copyStringKeyedMap(mergedMetadata.get(METADATA_DD))); + mergedMetadata.put(METADATA_DD, reservedDd); + } span.setTag(METADATA, mergedMetadata); } else { LOGGER.debug( diff --git a/dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy b/dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy index 0a728d0dafc..e2c626cbdf8 100644 --- a/dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy +++ b/dd-java-agent/agent-llmobs/src/test/groovy/datadog/trace/llmobs/domain/DDLLMObsSpanTest.groovy @@ -64,7 +64,6 @@ class DDLLMObsSpanTest extends DDSpecification{ private static final String OUTPUT = LLMOBS_TAG_PREFIX + "output" private static final String METADATA = LLMOBS_TAG_PREFIX + LLMObsTags.METADATA private static final String TOOL_DEFINITIONS = LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS - private static final String AGENT_MANIFEST = LLMOBS_TAG_PREFIX + "agent_manifest" private static final String PROMPT_TRACKING_INSTRUMENTATION_METHOD = LLMOBS_TAG_PREFIX + "prompt_tracking_instrumentation_method" @@ -702,7 +701,7 @@ class DDLLMObsSpanTest extends DDSpecification{ setup: def expectedSessionId = "session-abc-123" def parent = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "parent-workflow", expectedSessionId) - // Activate the parent's AgentScope so the child span is created in the same trace. + // Activate the parent's ContextScope so the child span is created in the same trace. // Without this, the child gets a fresh trace_id and the trace-consistency gate in // DDLLMObsSpan would (correctly) skip session_id inheritance. def parentScope = AgentTracer.activateSpan((AgentSpan) parent.span) @@ -741,7 +740,7 @@ class DDLLMObsSpanTest extends DDSpecification{ setup: def expectedSessionId = "session-grandparent-xyz" def grandparent = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "grandparent-workflow", expectedSessionId) - // Activate each ancestor's AgentScope so descendants stay in the same trace — + // Activate each ancestor's ContextScope so descendants stay in the same trace — // session_id inheritance is gated on trace-id consistency in DDLLMObsSpan. def grandparentScope = AgentTracer.activateSpan((AgentSpan) grandparent.span) def parent = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "parent-workflow", null) @@ -767,7 +766,7 @@ class DDLLMObsSpanTest extends DDSpecification{ def "child does NOT inherit session_id when stale LLMObsContext is from a different trace (e.g. async boundary leak)"() { setup: // Simulates a stale LLMObsContext (e.g. leaked across an async boundary). The parent's - // LLMObsContext is attached, but its AgentScope is deliberately NOT activated — so the + // LLMObsContext is attached, but its ContextScope is deliberately NOT activated — so the // next span we create starts a fresh trace and the trace-consistency gate must skip // session_id inheritance. def parent = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "stale-workflow", "stale-session-id") @@ -818,7 +817,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) stored["name"] == "travel_desk" stored["instructions"] == "Book travel." stored["model"] == "gpt-4o" @@ -846,7 +845,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) stored["name"] == "my-agent" stored["instructions"] == "Do something." stored["framework"] == "manual" @@ -869,7 +868,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) def toolList = (List) stored["tools"] toolList.size() == 1 toolList[0]["name"] == "valid-tool" @@ -891,7 +890,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) !stored.containsKey("tools") cleanup: @@ -908,7 +907,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - innerSpan.getTag(AGENT_MANIFEST) == null + storedManifest(innerSpan) == null cleanup: test.finish() @@ -933,7 +932,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) stored["name"] == "second" // second call wins on name stored["model"] == "gpt-4o" // second call wins on model stored["instructions"] == "v1 instructions" // first call's instructions preserved @@ -960,7 +959,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) def ms = (Map) stored["model_settings"] ms["temperature"] == 0.9 // second wins ms["max_tokens"] == 512 // first preserved @@ -983,7 +982,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - def stored = (Map) innerSpan.getTag(AGENT_MANIFEST) + def stored = storedManifest(innerSpan) def ms = (Map) stored["model_settings"] ms["temperature"] == 0.5 ms["custom_key"] == "custom_val" @@ -1001,7 +1000,7 @@ class DDLLMObsSpanTest extends DDSpecification{ then: def innerSpan = (AgentSpan) test.span - innerSpan.getTag(AGENT_MANIFEST) == null + storedManifest(innerSpan) == null cleanup: test.finish() @@ -1019,7 +1018,13 @@ class DDLLMObsSpanTest extends DDSpecification{ then: noExceptionThrown() def innerSpan = (AgentSpan) test.span - innerSpan.getTag(AGENT_MANIFEST) == null + storedManifest(innerSpan) == null + } + + /** The manifest is carried inside the metadata tag, under the reserved _dd namespace. */ + private static Map storedManifest(AgentSpan span) { + def dd = (Map) ((Map) span.getTag(METADATA))?.get("_dd") + return (Map) dd?.get("agent_manifest") } private LLMObsSpan llmObsSpan(String kind, name) { diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java index db45fa7ce33..1096fa8d219 100644 --- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java +++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentAttributionTest.java @@ -1,12 +1,13 @@ package datadog.trace.llmobs.domain; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; import datadog.trace.api.WellKnownTags; import datadog.trace.api.llmobs.LLMObs; -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.Tags; @@ -56,14 +57,14 @@ private static AgentSpan innerSpan(DDLLMObsSpan llmObsSpan) throws IllegalAccess } /** Starts a root APM span and activates it, so all LLMObs spans created within share a trace. */ - private static AgentScope startRootApmScope() { + private static ContextScope startRootApmScope() { AgentSpan root = AgentTracer.get().buildSpan("apm", "http.server.request").start(); return AgentTracer.activateSpan(root); } @Test void agentSpanStoresOwnIdAndNameAsPagent() throws Exception { - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "my-agent"); try { AgentSpan inner = innerSpan(agentSpan); @@ -74,7 +75,7 @@ void agentSpanStoresOwnIdAndNameAsPagent() throws Exception { assertEquals("my-agent", parentAgentName); } finally { agentSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @@ -83,7 +84,7 @@ void agentSpanStoresOwnIdAndNameAsPagent() throws Exception { void agentSpanNameIsPreservedRegardlessOfCharacters() throws Exception { // Agent names are stored as-is — no character restrictions since the only wire consumer // is the msgpack intake mapper, which accepts any string. - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "router~v2,résumé"); try { AgentSpan inner = innerSpan(agentSpan); @@ -91,7 +92,7 @@ void agentSpanNameIsPreservedRegardlessOfCharacters() throws Exception { assertEquals("router~v2,résumé", inner.getTag(PAGENT_NAME_TAG)); } finally { agentSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @@ -99,7 +100,7 @@ void agentSpanNameIsPreservedRegardlessOfCharacters() throws Exception { @Test void innerAgentNameOverridesOuterAgentNameForDescendants() throws Exception { // Descendants of an inner agent must see the inner agent's name, not the outer agent's. - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent"); try { DDLLMObsSpan innerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent"); @@ -119,7 +120,7 @@ void innerAgentNameOverridesOuterAgentNameForDescendants() throws Exception { } } finally { outerAgent.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @@ -127,7 +128,7 @@ void innerAgentNameOverridesOuterAgentNameForDescendants() throws Exception { @Test void nonAgentChildUnderAgentInheritsAttribution() throws Exception { // All LLMObs spans share the same APM trace so the trace-ID consistency gate passes. - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "parent-agent"); try { AgentSpan agentInner = innerSpan(agentSpan); @@ -144,14 +145,14 @@ void nonAgentChildUnderAgentInheritsAttribution() throws Exception { } } finally { agentSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @Test void transitiveInheritanceAgentToLlmToTool() throws Exception { - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "root-agent"); try { AgentSpan agentInner = innerSpan(agentSpan); @@ -173,14 +174,14 @@ void transitiveInheritanceAgentToLlmToTool() throws Exception { } } finally { agentSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @Test void noAgentAncestorProducesNoPagentTags() throws Exception { - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan workflowSpan = newSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "standalone-workflow"); try { AgentSpan inner = innerSpan(workflowSpan); @@ -188,7 +189,7 @@ void noAgentAncestorProducesNoPagentTags() throws Exception { assertNull(inner.getTag(PAGENT_NAME_TAG)); } finally { workflowSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @@ -198,7 +199,7 @@ void innerAgentFinishRestoresOuterAgentPropagationTags() throws Exception { // Outer agent's LLMObsContext is active. Inner agent starts (its own context pushed on top). // After inner agent finishes its context is popped, restoring outer agent's context. // A sibling span then sees outer agent's attribution via LLMObsContext. - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan outerAgent = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent"); try { AgentSpan outerInner = innerSpan(outerAgent); @@ -219,7 +220,7 @@ void innerAgentFinishRestoresOuterAgentPropagationTags() throws Exception { } } finally { outerAgent.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } @@ -229,7 +230,7 @@ void staleContextInDifferentTraceDoesNotInheritPagent() throws Exception { // Create an agent span in one APM trace, then create a non-agent span in a different APM // trace. The stale LLMObsContext from the first trace must not leak pagent attribution. AgentSpan firstRoot = AgentTracer.get().buildSpan("apm", "http.request.1").start(); - AgentScope firstScope = AgentTracer.activateSpan(firstRoot); + ContextScope firstScope = AgentTracer.activateSpan(firstRoot); DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "first-trace-agent"); // agentSpan's LLMObsContext is now active in the current thread @@ -240,7 +241,7 @@ void staleContextInDifferentTraceDoesNotInheritPagent() throws Exception { // Start a fresh APM root (different trace) while the first trace's LLMObsContext is active AgentSpan secondRoot = AgentTracer.get().buildSpan("apm", "http.request.2").start(); - AgentScope secondScope = AgentTracer.activateSpan(secondRoot); + ContextScope secondScope = AgentTracer.activateSpan(secondRoot); try { DDLLMObsSpan toolInSecondTrace = newSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "second-trace-tool"); try { @@ -262,7 +263,7 @@ void staleContextInDifferentTraceDoesNotInheritPagent() throws Exception { @Test void manifestNameOverridesSpanNameForPagent() throws Exception { - try (AgentScope apmScope = startRootApmScope()) { + try (ContextScope apmScope = startRootApmScope()) { DDLLMObsSpan agentSpan = newSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "span-name"); try { AgentSpan inner = innerSpan(agentSpan); @@ -276,7 +277,7 @@ void manifestNameOverridesSpanNameForPagent() throws Exception { assertEquals("manifest-name", inner.getTag(PAGENT_NAME_TAG)); } finally { agentSpan.finish(); - apmScope.span().finish(); + spanFromScope(apmScope).finish(); } } } diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java index 0f221ac5bd5..3e36b979c62 100644 --- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java +++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanAgentVersionTest.java @@ -4,10 +4,10 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNull; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; import datadog.trace.api.WellKnownTags; import datadog.trace.api.llmobs.LLMObsTags; -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.Tags; @@ -67,7 +67,7 @@ void agentSpanWithExplicitVersionTagsItself() { @Test void childSpanInheritsAgentVersionFromParentContext() { DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3"); - try (AgentScope ignored = AgentTracer.activateSpan(spanOf(agent))) { + try (ContextScope ignored = AgentTracer.activateSpan(spanOf(agent))) { DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null); try { assertEquals("v3", spanOf(child).getTag(AGENT_VERSION_TAG)); @@ -82,9 +82,9 @@ void childSpanInheritsAgentVersionFromParentContext() { @Test void grandchildTransitivelyInheritsAgentVersionThroughIntermediateSpan() { DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", "v3"); - try (AgentScope agentScope = AgentTracer.activateSpan(spanOf(agent))) { + try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) { DDLLMObsSpan workflow = llmObsSpan(Tags.LLMOBS_WORKFLOW_SPAN_KIND, "workflow1", null); - try (AgentScope workflowScope = AgentTracer.activateSpan(spanOf(workflow))) { + try (ContextScope workflowScope = AgentTracer.activateSpan(spanOf(workflow))) { DDLLMObsSpan grandchild = llmObsSpan(Tags.LLMOBS_LLM_SPAN_KIND, "llm1", null); try { assertEquals("v3", spanOf(grandchild).getTag(AGENT_VERSION_TAG)); @@ -102,9 +102,9 @@ void grandchildTransitivelyInheritsAgentVersionThroughIntermediateSpan() { @Test void nestedAgentWithOwnVersionOverridesForItsOwnSubtree() { DDLLMObsSpan outerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "outer-agent", "v1"); - try (AgentScope outerScope = AgentTracer.activateSpan(spanOf(outerAgent))) { + try (ContextScope outerScope = AgentTracer.activateSpan(spanOf(outerAgent))) { DDLLMObsSpan innerAgent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "inner-agent", "v2"); - try (AgentScope innerScope = AgentTracer.activateSpan(spanOf(innerAgent))) { + try (ContextScope innerScope = AgentTracer.activateSpan(spanOf(innerAgent))) { assertEquals("v2", spanOf(innerAgent).getTag(AGENT_VERSION_TAG)); DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "inner-tool", null); @@ -127,7 +127,7 @@ void nestedAgentWithOwnVersionOverridesForItsOwnSubtree() { @Test void noVersionSetAnywhereMeansNoTagOnAnySpanInTheSubtree() { DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "agent1", null); - try (AgentScope agentScope = AgentTracer.activateSpan(spanOf(agent))) { + try (ContextScope agentScope = AgentTracer.activateSpan(spanOf(agent))) { DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null); try { assertNull(spanOf(agent).getTag(AGENT_VERSION_TAG)); @@ -150,13 +150,13 @@ void childDoesNotInheritAgentVersionWhenStaleContextIsFromADifferentTrace() DDLLMObsSpan agent = llmObsSpan(Tags.LLMOBS_AGENT_SPAN_KIND, "stale-agent", "stale-v1"); // Close the standalone APM scope to simulate async boundary — LLMObs context leaks but // APM scope does not. - AgentScope apmScope = (AgentScope) STANDALONE_APM_SCOPE_FIELD.get(agent); + ContextScope apmScope = (ContextScope) STANDALONE_APM_SCOPE_FIELD.get(agent); if (apmScope != null) { apmScope.close(); } try { DDLLMObsSpan child = llmObsSpan(Tags.LLMOBS_TOOL_SPAN_KIND, "tool1", null); - try (AgentScope childScope = AgentTracer.activateSpan(spanOf(child))) { + try (ContextScope childScope = AgentTracer.activateSpan(spanOf(child))) { assertNotEquals( spanOf(agent).getTraceId(), spanOf(child).getTraceId(), diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java new file mode 100644 index 00000000000..e01e3cab701 --- /dev/null +++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanMetadataTest.java @@ -0,0 +1,95 @@ +package datadog.trace.llmobs.domain; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.trace.agent.tooling.TracerInstaller; +import datadog.trace.api.WellKnownTags; +import datadog.trace.api.llmobs.LLMObs; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.core.CoreTracer; +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.Map; +import org.junit.jupiter.api.AfterAll; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +/** + * The agent manifest is carried inside the metadata tag under the reserved {@code _dd} namespace, + * so metadata annotations and manifest annotations must not destroy each other in either order. + */ +class DDLLMObsSpanMetadataTest { + + private static final String METADATA_TAG = "_ml_obs_tag.metadata"; + private static final Field SPAN_FIELD; + + private static CoreTracer tracer; + + static { + try { + SPAN_FIELD = DDLLMObsSpan.class.getDeclaredField("span"); + SPAN_FIELD.setAccessible(true); + } catch (ReflectiveOperationException e) { + throw new ExceptionInInitializerError(e); + } + } + + @BeforeAll + static void installTracer() { + tracer = CoreTracer.builder().build(); + TracerInstaller.forceInstallGlobalTracer(tracer); + } + + @AfterAll + static void closeTracer() { + TracerInstaller.forceInstallGlobalTracer(null); + tracer.close(); + } + + private static DDLLMObsSpan newAgentSpan(String name) { + WellKnownTags tags = + new WellKnownTags("runtime-id", "hostname", "test", "service", "version", "java"); + return new DDLLMObsSpan( + Tags.LLMOBS_AGENT_SPAN_KIND, name, "test-ml-app", null, "service", tags); + } + + @SuppressWarnings("unchecked") + private static Map metadata(DDLLMObsSpan span) throws IllegalAccessException { + return (Map) ((AgentSpan) SPAN_FIELD.get(span)).getTag(METADATA_TAG); + } + + @SuppressWarnings("unchecked") + private static Map reservedDd(DDLLMObsSpan span) throws IllegalAccessException { + return (Map) metadata(span).get("_dd"); + } + + private static LLMObs.AgentManifest manifest(String name) { + return LLMObs.AgentManifest.builder().name(name).instructions("Do things.").build(); + } + + private static Map callerDd(String key, Object value) { + return Collections.singletonMap("_dd", Collections.singletonMap(key, value)); + } + + @Test + void manifestSurvivesMetadataAnnotationCarryingItsOwnReservedNamespace() throws Exception { + DDLLMObsSpan span = newAgentSpan("agent"); + span.annotateAgentManifest(manifest("agent")); + span.setMetadata(callerDd("cost_tags", Collections.singletonList("model:gpt-4o"))); + + Map dd = reservedDd(span); + assertTrue(dd.containsKey("agent_manifest")); + assertEquals(Collections.singletonList("model:gpt-4o"), dd.get("cost_tags")); + } + + @Test + void callerSuppliedReservedNamespaceIsKeptWhenThereIsNoManifest() throws Exception { + DDLLMObsSpan span = newAgentSpan("agent"); + span.setMetadata(Collections.singletonMap("tenant", "acme")); + span.setMetadata(callerDd("cost_tags", Collections.singletonList("a"))); + + assertEquals(Collections.singletonList("a"), reservedDd(span).get("cost_tags")); + } +} diff --git a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java index 5b411e32edf..3b105bae69b 100644 --- a/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java +++ b/dd-java-agent/agent-llmobs/src/test/java/datadog/trace/llmobs/domain/DDLLMObsSpanSamplingTest.java @@ -2,10 +2,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.TracerInstaller; import datadog.trace.api.WellKnownTags; import datadog.trace.api.llmobs.LLMObsSampler; -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.Tags; @@ -82,7 +82,7 @@ void childInheritsTheRootDecisionInsteadOfRecomputingIt() throws IllegalAccessEx AgentSpan rootSpan = spanOf(root); // Inheritance is gated on the two spans sharing an APM trace, so the root's APM span has to // be active for the child to be started under it. - try (AgentScope ignored = AgentTracer.activateSpan(rootSpan)) { + try (ContextScope ignored = AgentTracer.activateSpan(rootSpan)) { DDLLMObsSpan child = newSpan(new LLMObsSampler(0.0)); try { AgentSpan childSpan = spanOf(child); @@ -106,7 +106,7 @@ void childOfADroppedRootStaysDropped() throws IllegalAccessException { // is an unambiguous signal, so a child never mistakes an inherited drop for being a root. DDLLMObsSpan root = newSpan(new LLMObsSampler(0.0)); try { - try (AgentScope ignored = AgentTracer.activateSpan(spanOf(root))) { + try (ContextScope ignored = AgentTracer.activateSpan(spanOf(root))) { DDLLMObsSpan child = newSpan(new LLMObsSampler(1.0)); try { AgentSpan childSpan = spanOf(child); diff --git a/dd-java-agent/agent-logging/gradle.lockfile b/dd-java-agent/agent-logging/gradle.lockfile index 1f3e3073297..d6c64c54d10 100644 --- a/dd-java-agent/agent-logging/gradle.lockfile +++ b/dd-java-agent/agent-logging/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,7 +54,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-logs-intake/gradle.lockfile b/dd-java-agent/agent-logs-intake/gradle.lockfile index e409bd90c27..5e57f88b2a2 100644 --- a/dd-java-agent/agent-logs-intake/gradle.lockfile +++ b/dd-java-agent/agent-logs-intake/gradle.lockfile @@ -8,6 +8,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -20,8 +21,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -69,7 +70,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 0513716aa11..62ef279ec73 100644 --- a/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-bootstrap/gradle.lockfile @@ -7,8 +7,8 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -72,7 +72,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 a4907c94be0..bc3cc58492a 100644 --- a/dd-java-agent/agent-otel/otel-shim/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-shim/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 5433600a1b7..86581c215b0 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 @@ -11,7 +11,7 @@ import static io.opentelemetry.api.trace.StatusCode.OK; import static io.opentelemetry.api.trace.StatusCode.UNSET; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; @@ -166,7 +166,7 @@ public boolean isRecording() { return this.recording; } - public AgentScope activate() { + public ContextScope activate() { return activateSpan(this.delegate); } diff --git a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile index 7ad6771f355..1136cd53cba 100644 --- a/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile +++ b/dd-java-agent/agent-otel/otel-tooling/gradle.lockfile @@ -8,8 +8,8 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath com.datadoghq:dd-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +55,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/agent-profiling/gradle.lockfile b/dd-java-agent/agent-profiling/gradle.lockfile index 4ae134485dc..f48cafd73be 100644 --- a/dd-java-agent/agent-profiling/gradle.lockfile +++ b/dd-java-agent/agent-profiling/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -75,7 +75,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 1d3e2fa4317..6a6fed7e5a8 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-ddprof/gradle.lockfile @@ -9,7 +9,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=testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -75,7 +75,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 cf13f945e3e..bd495b77add 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-jfr/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,testFixturesRuntimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor @@ -64,7 +65,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,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 2599fa6274b..1ca1f3e642e 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 @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 529bfb298b8..2c55da9b568 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-openjdk/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -75,7 +75,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 9455e626522..ab4e70a2555 100644 --- a/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller-oracle/gradle.lockfile @@ -9,7 +9,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=testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -75,7 +75,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile index e2220c52902..64edfe675da 100644 --- a/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-controller/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -60,7 +61,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile index 6b061a1378c..2c42b9ba0d5 100644 --- a/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-ddprof/gradle.lockfile @@ -4,10 +4,11 @@ # To regenerate this file, run: ./gradlew :dd-java-agent:agent-profiling:profiling-ddprof: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-instrument-java:0.0.5=jmhRuntimeClasspath,runtimeClasspath,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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jmhCompileClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor @@ -64,7 +65,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,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 8649025b2e9..009ce612fe3 100644 --- a/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-scrubber/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,7 +53,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=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 8d432994463..463a5abad5d 100644 --- a/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-testing/gradle.lockfile @@ -6,8 +6,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -68,7 +68,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 14a40e3a731..26b785c6db7 100644 --- a/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-uploader/gradle.lockfile @@ -9,6 +9,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -25,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -89,7 +90,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile index e8b0aabc450..26af346b0f9 100644 --- a/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile +++ b/dd-java-agent/agent-profiling/profiling-utils/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/agent-tooling/gradle.lockfile b/dd-java-agent/agent-tooling/gradle.lockfile index 6045d479c29..8b46f80eade 100644 --- a/dd-java-agent/agent-tooling/gradle.lockfile +++ b/dd-java-agent/agent-tooling/gradle.lockfile @@ -31,8 +31,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath,test_java11RuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_java11CompileClasspath,test_java11RuntimeClasspath org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath diff --git a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java index 2ae8cb21921..bf0b9ab62c5 100644 --- a/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java +++ b/dd-java-agent/agent-tooling/src/main/java/datadog/trace/agent/tooling/bytebuddy/matcher/ClassLoaderMatchers.java @@ -58,6 +58,7 @@ public static boolean canSkipClassLoaderByName(final ClassLoader loader) { case "org.drools.core.rule.PackageClassLoader": case "org.drools.wiring.dynamic.PackageClassLoader": case "org.drools.core.rule.JavaDialectRuntimeData$PackageClassLoader": + case "org.drools.wiring.dynamic.DynamicProjectClassLoader$DefaultInternalTypesClassLoader": return true; } if (CHECK_EXCLUDES) { diff --git a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ClassLoaderMatchersTest.groovy b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ClassLoaderMatchersTest.groovy index 39cdc2f7d16..33d03367d75 100644 --- a/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ClassLoaderMatchersTest.groovy +++ b/dd-java-agent/agent-tooling/src/test/groovy/datadog/trace/agent/test/ClassLoaderMatchersTest.groovy @@ -66,7 +66,8 @@ class ClassLoaderMatchersTest extends DDSpecification { loaderName << [ "org.drools.core.rule.PackageClassLoader", "org.drools.wiring.dynamic.PackageClassLoader", - "org.drools.core.rule.JavaDialectRuntimeData\$PackageClassLoader" + "org.drools.core.rule.JavaDialectRuntimeData\$PackageClassLoader", + "org.drools.wiring.dynamic.DynamicProjectClassLoader\$DefaultInternalTypesClassLoader" ] } diff --git a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile index 80c61db41e6..ae06bb4afea 100644 --- a/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile +++ b/dd-java-agent/appsec/appsec-test-fixtures/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -93,7 +93,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/appsec/build.gradle b/dd-java-agent/appsec/build.gradle index 2e88715aeb0..ccc4333b487 100644 --- a/dd-java-agent/appsec/build.gradle +++ b/dd-java-agent/appsec/build.gradle @@ -21,6 +21,7 @@ dependencies { compileOnly project(':dd-java-agent:agent-bootstrap') compileOnly libs.bytebuddy // for net.bytebuddy.jar.asm.* used by ScaReachabilityTransformer testImplementation project(':dd-java-agent:agent-bootstrap') + testImplementation project(':dd-trace-core') testImplementation libs.bytebuddy testImplementation project(':remote-config:remote-config-core') testImplementation project(':utils:test-utils') diff --git a/dd-java-agent/appsec/gradle.lockfile b/dd-java-agent/appsec/gradle.lockfile index c9ce4f22e6c..e0fba8b0592 100644 --- a/dd-java-agent/appsec/gradle.lockfile +++ b/dd-java-agent/appsec/gradle.lockfile @@ -8,7 +8,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.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -26,12 +26,13 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs com.google.errorprone:error_prone_annotations:2.48.0=spotbugs +com.google.re2j:re2j:1.8=jmhRuntimeClasspath,testRuntimeClasspath com.squareup.moshi:moshi:1.11.0=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.squareup.okio:okio:1.17.5=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc @@ -73,6 +74,8 @@ org.jacoco:org.jacoco.agent:0.8.15=jacocoAgent,jacocoAnt org.jacoco:org.jacoco.ant:0.8.15=jacocoAnt org.jacoco:org.jacoco.core:0.8.15=jacocoAnt org.jacoco:org.jacoco.report:0.8.15=jacocoAnt +org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,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 @@ -81,7 +84,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java index c78b779c3ee..b55df0f2e85 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/api/security/AppSecSpanPostProcessor.java @@ -88,7 +88,7 @@ private void extractSchemas( GatewayContext gwCtx = new GatewayContext(false); producerService.publishDataEvent(sub, ctx, bundle, gwCtx); // NOTE: must be checked before committing derivatives, as that clears the derivatives map - if (hasSchemaDerivative(ctx)) { + if (ctx.hasDerivativeKeyStartingWith(SCHEMA_DERIVATIVE_PREFIX)) { WafMetricCollector.get().apiSecurityRequestSchema(framework); } else { WafMetricCollector.get().apiSecurityRequestNoSchema(framework); @@ -98,13 +98,4 @@ private void extractSchemas( log.debug("Subscriber info expired", e); } } - - private static boolean hasSchemaDerivative(final AppSecRequestContext ctx) { - for (String key : ctx.getDerivativeKeys()) { - if (key != null && key.startsWith(SCHEMA_DERIVATIVE_PREFIX)) { - return true; - } - } - return false; - } } diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java index c3b8f750dba..faf5216d2e4 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/ddwaf/WAFResultData.java @@ -3,6 +3,17 @@ import java.util.List; import java.util.Map; +/** + * Deserialization target for the JSON the WAF returns alongside a match. + * + *

These types are bound by a Moshi reflective adapter built in {@link WAFModule}'s + * static initializer. Moshi instantiates them through a no-arg constructor, falling back to {@code + * sun.misc.Unsafe} when none is declared; on a runtime that does not resolve the {@code + * jdk.unsupported} module that fallback is unavailable and adapter construction fails, taking down + * AppSec startup with it. The {@code Unsafe} fallback is therefore not something to rely on: every + * class here must keep a no-arg constructor, including the implicit one — adding an all-args + * constructor without also declaring a no-arg one removes it. + */ public class WAFResultData { Rule rule; List rule_matches; @@ -13,6 +24,8 @@ public static class RuleMatch { String operator_value; List parameters; + RuleMatch() {} + public RuleMatch(String operator, String operator_value, List parameters) { this.operator = operator; this.operator_value = operator_value; @@ -25,6 +38,8 @@ public static class Rule { String name; Map tags; + Rule() {} + public Rule(String id, String name, Map tags) { this.id = id; this.name = name; @@ -38,6 +53,8 @@ public static class Parameter extends MatchInfo { MatchInfo db_type; List highlight; + Parameter() {} + public Parameter(String address, List key_path, String value, List highlight) { super(address, key_path, value); this.highlight = highlight; @@ -49,6 +66,8 @@ public static class MatchInfo { List key_path; String value; + MatchInfo() {} + public MatchInfo(String address, List key_path, String value) { this.address = address; this.key_path = key_path; 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 d96dd1e54dc..af817f7eca7 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 @@ -1,7 +1,9 @@ package com.datadog.appsec.gateway; import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; +import static java.util.Collections.emptyMap; import static java.util.Collections.emptySet; +import static java.util.Collections.unmodifiableMap; import com.datadog.appsec.event.data.Address; import com.datadog.appsec.event.data.DataBundle; @@ -127,8 +129,16 @@ public class AppSecRequestContext implements DataBundle, Closeable, AppSecContex private String apiSecurityFramework; private String endpoint; private boolean endpointComputed = false; - private final Map> requestHeaders = new LinkedHashMap<>(); - private final Map> responseHeaders = new LinkedHashMap<>(); + // Handed out live to readers that may run on the trace-processing thread (API Security schema + // extraction), so close() must release these by nulling the reference, never by clearing the map: + // mutating a snapshot mid-iteration corrupts it (APPSEC-70134). Volatile because that release can + // happen on a different thread than the header writes. + // + // null also means "no header seen yet", so an untouched context allocates nothing. Only + // addRequestHeader/addResponseHeader materialize, which assumes the single writer the plain + // LinkedHashMap already assumes; the getters null-coalesce so no reader allocates. + private volatile Map> requestHeaders; + private volatile Map> responseHeaders; private volatile Map> collectedCookies; private boolean finishedRequestHeaders; private boolean finishedResponseHeaders; @@ -150,6 +160,13 @@ public class AppSecRequestContext implements DataBundle, Closeable, AppSecContex private boolean responseBodyPublished; private boolean respDataPublished; private boolean pathParamsPublished; + + /** + * WAF-reported attributes, published copy-on-write: writers publish a fresh unmodifiable copy + * instead of mutating in place, so a reader can keep the instance it read without + * synchronization. Mutating a published map would break readers running on the trace-processing + * thread (APPSEC-70134). + */ private final AtomicReference> derivatives = new AtomicReference<>(); private final AtomicBoolean rateLimited = new AtomicBoolean(false); @@ -555,9 +572,12 @@ void addRequestHeader(String name, String value) { return; } - List strings = - requestHeaders.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)); - strings.add(value); + Map> headers = requestHeaders; + if (headers == null) { + headers = new LinkedHashMap<>(); + requestHeaders = headers; + } + headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)).add(value); } void finishRequestHeaders() { @@ -569,7 +589,8 @@ boolean isFinishedRequestHeaders() { } Map> getRequestHeaders() { - return requestHeaders; + Map> headers = requestHeaders; + return headers != null ? headers : emptyMap(); } void addResponseHeader(String name, String value) { @@ -581,9 +602,12 @@ void addResponseHeader(String name, String value) { return; } - List strings = - responseHeaders.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)); - strings.add(value); + Map> headers = responseHeaders; + if (headers == null) { + headers = new LinkedHashMap<>(); + responseHeaders = headers; + } + headers.computeIfAbsent(name.toLowerCase(Locale.ROOT), h -> new ArrayList<>(1)).add(value); } public void finishResponseHeaders() { @@ -595,7 +619,8 @@ public boolean isFinishedResponseHeaders() { } Map> getResponseHeaders() { - return responseHeaders; + Map> headers = responseHeaders; + return headers != null ? headers : emptyMap(); } void addCookies(Map> cookies) { @@ -761,13 +786,11 @@ public void close() { // a late/async caller of getOrCreateWafContext() cannot resurrect a context (APPSEC-69085). closeWafContext(); collectedCookies = null; - requestHeaders.clear(); - responseHeaders.clear(); persistentData.clear(); - final Map derivatives = this.derivatives.getAndSet(null); - if (derivatives != null) { - derivatives.clear(); - } + // Null the reference, never clear in place (APPSEC-70134): see the field declarations. + this.requestHeaders = null; + this.responseHeaders = null; + this.derivatives.set(null); } } @@ -888,7 +911,8 @@ else if (config.containsKey("address")) { } } - return updated; + // Unmodifiable: readers may hold this instance indefinitely. + return unmodifiableMap(updated); }); } @@ -932,9 +956,9 @@ private Object getDataForAddress(String address) { // Map common addresses to our data structures switch (address) { case "server.request.headers": - return requestHeaders; + return getRequestHeaders(); case "server.response.headers": - return responseHeaders; + return getResponseHeaders(); case "server.request.cookies": return collectedCookies; case "server.request.uri.raw": @@ -1074,10 +1098,26 @@ public boolean commitDerivatives(TraceSegment traceSegment) { return true; } - // Mainly used for testing and logging + /** + * Mainly used for testing and debug logging. The published map is unmodifiable, so its key set is + * returned directly as a stable view. + */ public Set getDerivativeKeys() { Map current = derivatives.get(); - return current == null ? emptySet() : new HashSet<>(current.keySet()); + return current == null ? emptySet() : current.keySet(); + } + + /** + * Whether any currently reported derivative key starts with the given prefix. Must be called + * before {@link #commitDerivatives(TraceSegment)}, which detaches the derivatives map. + */ + public boolean hasDerivativeKeyStartingWith(final String prefix) { + for (String key : getDerivativeKeys()) { + if (key != null && key.startsWith(prefix)) { + return true; + } + } + return false; } public boolean isThrottled(RateLimiter rateLimiter) { diff --git a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java index a1ed1cb55ae..a7b994f5b9f 100644 --- a/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java +++ b/dd-java-agent/appsec/src/main/java/com/datadog/appsec/report/AppSecEventWrapper.java @@ -6,6 +6,7 @@ import com.squareup.moshi.Moshi; import java.io.IOException; import java.util.Collection; +import java.util.Collections; import java.util.Objects; public class AppSecEventWrapper { @@ -39,6 +40,16 @@ public void toJson(JsonWriter writer, Double value) throws IOException { private final Collection triggers; private String json; + /** + * Required by the Moshi reflective adapter above. The adapter is only ever used to serialize, but + * Moshi resolves the instantiation strategy when the adapter is built, not when it is used: with + * no declared no-arg constructor it falls back to {@code sun.misc.Unsafe}, and on a runtime that + * does not resolve the {@code jdk.unsupported} module building the adapter throws. + */ + private AppSecEventWrapper() { + this.triggers = Collections.emptyList(); + } + public AppSecEventWrapper(Collection events) { this.triggers = events; } diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/AppSecSpanPostProcessorTest.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/AppSecSpanPostProcessorTest.groovy index fb7b06a0e47..0c6bd8a871a 100644 --- a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/AppSecSpanPostProcessorTest.groovy +++ b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/api/security/AppSecSpanPostProcessorTest.groovy @@ -13,7 +13,7 @@ import spock.lang.Shared class AppSecSpanPostProcessorTest extends DDSpecification { - private static final String SCHEMA_DERIVATIVE_KEY = '_dd.appsec.s.req.body' + private static final String SCHEMA_DERIVATIVE_PREFIX = '_dd.appsec.s.' private static final String FRAMEWORK = 'netty' @@ -55,7 +55,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification { 1 * subInfo.isEmpty() >> false 1 * ctx.getApiSecurityFramework() >> FRAMEWORK 1 * producer.publishDataEvent(_, ctx, _, _) - 1 * ctx.getDerivativeKeys() >> ([SCHEMA_DERIVATIVE_KEY] as Set) + 1 * ctx.hasDerivativeKeyStartingWith(SCHEMA_DERIVATIVE_PREFIX) >> true 1 * wafMetricCollector.apiSecurityRequestSchema(FRAMEWORK) 1 * ctx.commitDerivatives(traceSegment) 1 * ctx.setKeepOpenForApiSecurityPostProcessing(false) @@ -299,7 +299,7 @@ class AppSecSpanPostProcessorTest extends DDSpecification { 1 * producer.getDataSubscribers(KnownAddresses.WAF_CONTEXT_PROCESSOR) >> subInfo 1 * subInfo.isEmpty() >> false 1 * producer.publishDataEvent(_, ctx, _, _) - 1 * ctx.getDerivativeKeys() >> (derivativeKeys as Set) + 1 * ctx.hasDerivativeKeyStartingWith(SCHEMA_DERIVATIVE_PREFIX) >> hasSchemaDerivative schemaMetrics * wafMetricCollector.apiSecurityRequestSchema(framework) noSchemaMetrics * wafMetricCollector.apiSecurityRequestNoSchema(framework) 1 * ctx.commitDerivatives(traceSegment) @@ -310,9 +310,8 @@ class AppSecSpanPostProcessorTest extends DDSpecification { 0 * _ where: - scenario | derivativeKeys | framework || schemaMetrics | noSchemaMetrics - 'no derivatives at all' | [] | FRAMEWORK || 0 | 1 - 'no derivative is a schema' | ['_dd.appsec.fp.http.header'] | FRAMEWORK || 0 | 1 - 'missing component tag' | [SCHEMA_DERIVATIVE_KEY] | null || 1 | 0 + scenario | hasSchemaDerivative | framework || schemaMetrics | noSchemaMetrics + 'no schema derivative' | false | FRAMEWORK || 0 | 1 + 'missing component tag' | true | null || 1 | 0 } } diff --git a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy b/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy deleted file mode 100644 index d093190f228..00000000000 --- a/dd-java-agent/appsec/src/test/groovy/com/datadog/appsec/gateway/AppSecRequestContextSpecification.groovy +++ /dev/null @@ -1,824 +0,0 @@ -package com.datadog.appsec.gateway - -import com.datadog.appsec.ddwaf.WafInitialization -import com.datadog.appsec.event.data.KnownAddresses -import com.datadog.appsec.event.data.MapDataBundle -import com.datadog.appsec.report.AppSecEvent -import com.datadog.ddwaf.Waf -import com.datadog.ddwaf.WafBuilder -import com.datadog.ddwaf.WafContext -import com.squareup.moshi.JsonAdapter -import com.squareup.moshi.Moshi -import com.squareup.moshi.Types -import datadog.trace.api.Config -import datadog.trace.api.telemetry.LogCollector -import datadog.trace.test.logging.TestLogCollector -import datadog.trace.test.util.DDSpecification -import datadog.trace.util.stacktrace.StackTraceEvent -import datadog.trace.util.stacktrace.StackTraceFrame -import okio.Okio - -class AppSecRequestContextSpecification extends DDSpecification { - - private static final JsonAdapter> ADAPTER = - new Moshi.Builder() - .build() - .adapter(Types.newParameterizedType(Map, String, Object)) - - AppSecRequestContext ctx = new AppSecRequestContext() - WafBuilder wafBuilder - - void 'implements DataBundle'() { - when: - ctx.addAll(MapDataBundle.of(KnownAddresses.REQUEST_URI_RAW, '/a')) - - then: - ctx.size() == 1 - ctx.get(KnownAddresses.REQUEST_URI_RAW) == '/a' - ctx.allAddresses as List == [KnownAddresses.REQUEST_URI_RAW] - ctx.hasAddress(KnownAddresses.REQUEST_URI_RAW) - - when: - def iter = ctx.iterator() - - then: - iter.hasNext() - - when: - def elem = iter.next() - - then: - elem.key == KnownAddresses.REQUEST_URI_RAW - elem.value == '/a' - } - - void 'it is closeable'() { - expect: - assert ctx.respondsTo('close') - - when: - ctx.close() - - then: - notThrown(Exception) - } - - void 'adding headers after they are said to be finished is forbidden'() { - when: - ctx.finishRequestHeaders() - - and: - ctx.addRequestHeader('a', 'b') - - then: - ctx.finishedRequestHeaders - thrown(IllegalStateException) - - when: - ctx.addCookies(a: ['b']) - - then: - thrown(IllegalStateException) - } - - void 'setting uri a second time is ignored, first value wins'() { - when: - ctx.rawURI = '/a' - ctx.rawURI = '/b' - - then: - noExceptionThrown() - ctx.savedRawURI == '/a' - } - - void 'saves cookies and other headers'() { - when: - ctx.addCookies([a: ['c']]) - ctx.addRequestHeader('user-agent', 'foo') - - then: - ctx.requestHeaders['user-agent'] == ['foo'] - ctx.cookies == [a: ['c']] - } - - void 'can save the URI'() { - when: - ctx.savedRawURI = '/a' - - then: - ctx.savedRawURI == '/a' - } - - void 'can collect events'() { - when: - ctx.reportEvents([new AppSecEvent(), new AppSecEvent()]) - def events = ctx.transferCollectedEvents() - - then: - events.size() == 2 - events[0] != null - events[1] != null - - when: - ctx.reportEvents([new AppSecEvent()]) - events = ctx.transferCollectedEvents() - - then: - events.size() == 1 - events[0] != null - } - - void 'collect events when none reported'() { - expect: - ctx.transferCollectedEvents().empty - } - - void 'can collect stack traces'() { - setup: - StackTraceElement element = new StackTraceElement('class', 'method', 'file', 1) - StackTraceFrame frame = new StackTraceFrame(1, element) - StackTraceEvent event = new StackTraceEvent([frame], 'java', 'id', 'message') - - when: - ctx.reportStackTrace(event) - final result = ctx.getStackTraces() - - then: - result.size() == 1 - result[0].id == 'id' - result[0].message == 'message' - result[0].language == 'java' - result[0].frames.size() == 1 - result[0].frames[0].id == 1 - result[0].frames[0].text == 'class.method(file:1)' - result[0].frames[0].file == 'file' - result[0].frames[0].line == 1 - result[0].frames[0].class_name == 'class' - result[0].frames[0].function == 'method' - } - - void 'collect stack traces when none reported'() { - expect: - ctx.getStackTraces() == null - } - - void 'headers allow list should contains only lowercase names'() { - expect: - headers.each { - assert it == it.toLowerCase(): "REASON: Allow header name \"$it\" MUST be lowercase" - } - - where: - headers | name - AppSecRequestContext.DEFAULT_REQUEST_HEADERS_ALLOW_LIST | 'Default request headers' - AppSecRequestContext.REQUEST_HEADERS_ALLOW_LIST | 'Request headers' - AppSecRequestContext.RESPONSE_HEADERS_ALLOW_LIST | 'Response headers' - } - - void 'basic headers collection test'() { - when: - ctx.addRequestHeader('Host', '127.0.0.1') - ctx.addRequestHeader('Content-Type', 'text/html; charset=UTF-8') - ctx.addRequestHeader('Custom-Header', 'value1') - ctx.addRequestHeader('Accept', 'application/json') - - then: - ctx.requestHeaders == [ - 'host': ['127.0.0.1'], - 'content-type': ['text/html; charset=UTF-8'], - 'custom-header': ['value1'], - 'accept': ['application/json']] as Map - } - - void 'null headers should be ignored'() { - when: - ctx.addRequestHeader(null, 'value') - ctx.addRequestHeader('key', null) - - then: - ctx.requestHeaders.isEmpty() - } - - void 'concat multiple values for same header'() { - when: - ctx.addRequestHeader('Custom-Header', 'value1') - ctx.addRequestHeader('CUSTOM-HEADER', 'value2') - ctx.addRequestHeader('Accept', 'application/json') - ctx.addRequestHeader('accept', 'application/xml') - - then: - ctx.requestHeaders == [ - 'custom-header': ['value1', 'value2'], - 'accept': ['application/json', 'application/xml']] as Map - } - - private WafContext createWafContext() { - WafInitialization.ONLINE - Waf.initialize false - wafBuilder?.close() - wafBuilder = new WafBuilder() - def stream = getClass().classLoader.getResourceAsStream("test_multi_config.json") - wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream)))) - new WafContext(wafBuilder.buildWafHandleInstance()) - } - - void 'close closes the wafContext'() { - setup: - def wafContext = createWafContext() - - when: - ctx.wafContext = wafContext - ctx.close() - - then: - ctx.wafContext == null - !wafContext.online - } - - void 'test isThrottled'(){ - setup: - def rateLimiter = Mock(RateLimiter) - def appSecRequestContext = new AppSecRequestContext() - - when: 'rate limiter is called and throttled is set' - def result = appSecRequestContext.isThrottled(rateLimiter) - - then: - 1 * rateLimiter.isThrottled() >> true - assert result - - when: 'rate limiter is not called more than once per appsec context returns first result' - def result2 = appSecRequestContext.isThrottled(rateLimiter) - - then: - 0 * rateLimiter.isThrottled() - result == result2 - } - - - void 'test that internal data is cleared on close'() { - setup: - final ctx = new AppSecRequestContext() - - when: - ctx.requestHeaders.put('Accept', ['*']) - ctx.responseHeaders.put('Content-Type', ['text/plain']) - ctx.collectedCookies = [cookie : ['test']] - ctx.persistentData.put(KnownAddresses.REQUEST_METHOD, 'GET') - // Use reportDerivatives to properly set values via AtomicReference - ctx.reportDerivatives(['test_attr': ['value': 'test_value']]) - ctx.wafContext = createWafContext() - ctx.close() - - then: - ctx.wafContext == null - // Check that derivatives AtomicReference contains null after close - ctx.derivatives.get() == null - - ctx.requestHeaders.isEmpty() - ctx.responseHeaders.isEmpty() - ctx.cookies.isEmpty() - ctx.persistentData.isEmpty() - } - - def "test increase and get WafTimeouts"() { - when: - ctx.increaseWafTimeouts() - ctx.increaseWafTimeouts() - - then: - ctx.getWafTimeouts() == 2 - } - - def "test increase and get RaspTimeouts"() { - when: - ctx.increaseRaspTimeouts() - ctx.increaseRaspTimeouts() - - then: - ctx.getRaspTimeouts() == 2 - } - - void 'close logs if request end was not called'() { - given: - TestLogCollector.enable() - def ctx = new AppSecRequestContext() - - when: - ctx.close() - - then: - def log = TestLogCollector.drainCapturedLogs().find { it.message.contains('Request end event was not called before close') } - log != null - log.marker == LogCollector.SEND_TELEMETRY - - cleanup: - TestLogCollector.disable() - } - void 'test that processed attributes are cleared on close'() { - setup: - def derivatives = [ - 'numeric': '42', - 'string': 'value' - ] - - when: - ctx.reportDerivatives(derivatives) - ctx.close() - - then: - ctx.getDerivativeKeys().isEmpty() - } - - def "test attribute handling with literal values and request data extraction"() { - given: - def context = new AppSecRequestContext() - context.setMethod("POST") - context.setScheme("https") - context.setRawURI("/api/test") - context.setRoute("/api/{param}") - context.setResponseStatus(200) - context.addRequestHeader("user-agent", "TestAgent/1.0") - context.addRequestHeader("content-type", "application/json") - - // Test data for attributes - def attributes = [ - "_dd.appsec.s.res.headers": [ - "value": "literal-header-value" - ], - "_dd.appsec.s.res.method": [ - "address": "server.request.method" - ], - "_dd.appsec.s.res.scheme": [ - "address": "server.request.scheme" - ], - "_dd.appsec.s.res.uri": [ - "address": "server.request.uri.raw" - ], - "_dd.appsec.s.res.route": [ - "address": "server.request.route" - ], - "_dd.appsec.s.res.status": [ - "address": "server.response.status" - ], - "_dd.appsec.s.res.user_agent": [ - "address": "server.request.headers", - "key_path": ["user-agent"] - ], - "_dd.appsec.s.res.content_type": [ - "address": "server.request.headers", - "key_path": ["content-type"] - ], - "_dd.appsec.s.res.user_agent_lower": [ - "address": "server.request.headers", - "key_path": ["user-agent"], - "transformers": ["lowercase"] - ], - "_dd.appsec.s.res.content_type_upper": [ - "address": "server.request.headers", - "key_path": ["content-type"], - "transformers": ["uppercase"] - ] - ] - - when: - context.reportDerivatives(attributes) - def keys = context.getDerivativeKeys() - - then: - keys.size() == 10 - keys.contains("_dd.appsec.s.res.headers") - keys.contains("_dd.appsec.s.res.method") - keys.contains("_dd.appsec.s.res.scheme") - keys.contains("_dd.appsec.s.res.uri") - keys.contains("_dd.appsec.s.res.route") - keys.contains("_dd.appsec.s.res.status") - keys.contains("_dd.appsec.s.res.user_agent") - keys.contains("_dd.appsec.s.res.content_type") - keys.contains("_dd.appsec.s.res.user_agent_lower") - keys.contains("_dd.appsec.s.res.content_type_upper") - } - - def "test attribute handling with unknown address"() { - given: - def context = new AppSecRequestContext() - - def attributes = [ - "_dd.appsec.s.res.unknown": [ - "address": "server.request.unknown" - ] - ] - - when: - context.reportDerivatives(attributes) - def keys = context.getDerivativeKeys() - - then: - keys.size() == 0 // No attributes should be added for unknown addresses - } - - def "test attribute handling with invalid key path"() { - given: - def context = new AppSecRequestContext() - context.addRequestHeader("user-agent", "TestAgent/1.0") - - def attributes = [ - "_dd.appsec.s.res.invalid": [ - "address": "server.request.headers", - "key_path": ["non-existent-header"] - ] - ] - - when: - context.reportDerivatives(attributes) - def keys = context.getDerivativeKeys() - - then: - keys.size() == 0 // No attributes should be added for invalid key paths - } - - void 'test sampling of requests'() { - given: - final maxRequests = Config.get().apiSecurityMaxDownstreamRequestBodyAnalysis - final context = new AppSecRequestContext() - final random = new Random() - final requestIds = (0..maxRequests).collect { random.nextLong() } - - when: - final map = requestIds.collectEntries{ [(it) : context.sampleHttpClientRequest(it)] } - - then: - map.values().count { it } == maxRequests - map.each { requestId, sampled -> - assert context.isHttpClientRequestSampled(requestId) == sampled - } - } - - def "test commitDerivatives with different value types"() { - given: - def context = new AppSecRequestContext() - def mockTraceSegment = Mock(datadog.trace.api.internal.TraceSegment) - def committedTags = [:] - - // Mock setTagTop to capture what's being set - mockTraceSegment.setTagTop(_ as String, _ as Object) >> { String key, Object value -> - committedTags[key] = value - } - - // Set up derivatives with different types - def derivatives = [ - 'numeric_int': ['value': 42], - 'numeric_double': ['value': 3.14], - 'string_value': ['value': 'test_string'], - 'boolean_true': ['value': true], - 'boolean_false': ['value': false], - 'numeric_string': ['value': '100'], - 'double_string': ['value': '99.5'], - 'non_numeric_string': ['value': 'not_a_number'] - ] - - when: - context.reportDerivatives(derivatives) - def result = context.commitDerivatives(mockTraceSegment) - - then: - result == true - committedTags.size() == 8 - - // Verify numeric values are preserved as numbers - committedTags['numeric_int'] == 42 - committedTags['numeric_int'] instanceof Integer - - // In Groovy, 3.14 is BigDecimal, not Double - both are Numbers - committedTags['numeric_double'] == 3.14 - committedTags['numeric_double'] instanceof Number - - // Verify strings are handled correctly - committedTags['string_value'] == 'test_string' - committedTags['string_value'] instanceof String - - // Verify booleans are preserved - committedTags['boolean_true'] == true - committedTags['boolean_true'] instanceof Boolean - - committedTags['boolean_false'] == false - committedTags['boolean_false'] instanceof Boolean - - // Verify numeric strings are converted to numbers - committedTags['numeric_string'] == 100 - committedTags['numeric_string'] instanceof Long - - committedTags['double_string'] == 99.5 - committedTags['double_string'] instanceof Number - - // Verify non-numeric strings remain strings - committedTags['non_numeric_string'] == 'not_a_number' - committedTags['non_numeric_string'] instanceof String - } - - def "test commitDerivatives clears derivatives atomically"() { - given: - def context = new AppSecRequestContext() - def mockTraceSegment = Mock(datadog.trace.api.internal.TraceSegment) - - def derivatives = [ - 'attr1': ['value': 'value1'], - 'attr2': ['value': 'value2'] - ] - - when: - context.reportDerivatives(derivatives) - - then: - context.getDerivativeKeys().size() == 2 - - when: - context.commitDerivatives(mockTraceSegment) - - then: - // Derivatives should be cleared after commit - context.getDerivativeKeys().isEmpty() - context.derivatives.get() == null - } - - def "test commitDerivatives with null TraceSegment returns false"() { - given: - def context = new AppSecRequestContext() - - when: - def result = context.commitDerivatives(null) - - then: - result == false - } - - def "test multiple reportDerivatives calls accumulate values"() { - given: - def context = new AppSecRequestContext() - - when: - // First report - context.reportDerivatives([ - 'attr1': ['value': 'value1'], - 'attr2': ['value': 'value2'] - ]) - - then: - context.getDerivativeKeys().size() == 2 - context.getDerivativeKeys().contains('attr1') - context.getDerivativeKeys().contains('attr2') - - when: - // Second report - should accumulate - context.reportDerivatives([ - 'attr3': ['value': 'value3'], - 'attr4': ['value': 'value4'] - ]) - - then: - context.getDerivativeKeys().size() == 4 - context.getDerivativeKeys().contains('attr1') - context.getDerivativeKeys().contains('attr2') - context.getDerivativeKeys().contains('attr3') - context.getDerivativeKeys().contains('attr4') - } - - def "test multiple reportDerivatives with overlapping keys uses last value"() { - given: - def context = new AppSecRequestContext() - def mockTraceSegment = Mock(datadog.trace.api.internal.TraceSegment) - def committedTags = [:] - - mockTraceSegment.setTagTop(_ as String, _ as Object) >> { String key, Object value -> - committedTags[key] = value - } - - when: - // First report - context.reportDerivatives([ - 'attr1': ['value': 'first_value'] - ]) - - // Second report with same key - should overwrite - context.reportDerivatives([ - 'attr1': ['value': 'second_value'] - ]) - - context.commitDerivatives(mockTraceSegment) - - then: - committedTags['attr1'] == 'second_value' - } - - def "test reportDerivatives maintains data integrity under concurrent access"() { - given: - def context = new AppSecRequestContext() - def numThreads = 3 - def startLatch = new java.util.concurrent.CountDownLatch(1) - - when: - // Simulate concurrent updates from multiple threads - def executorService = java.util.concurrent.Executors.newFixedThreadPool(numThreads) - def futures = [] - - futures << executorService.submit({ - startLatch.await() // Wait for all threads to be ready - context.reportDerivatives(['attr1': ['value': 'value1']]) - context.reportDerivatives(['attr2': ['value': 'value2']]) - }) - - futures << executorService.submit({ - startLatch.await() // Wait for all threads to be ready - context.reportDerivatives(['attr3': ['value': 'value3']]) - context.reportDerivatives(['attr4': ['value': 'value4']]) - }) - - futures << executorService.submit({ - startLatch.await() // Wait for all threads to be ready - context.reportDerivatives(['attr5': ['value': 'value5']]) - context.reportDerivatives(['attr6': ['value': 'value6']]) - }) - - // Release all threads at once to maximize concurrent execution - startLatch.countDown() - - // Wait for all tasks to complete using the futures - futures.each { it.get() } - executorService.shutdown() - - then: - // Verify all attributes were added despite concurrent access - def keys = context.getDerivativeKeys() - keys.size() >= 6 // At least the 6 we explicitly added - ['attr1', 'attr2', 'attr3', 'attr4', 'attr5', 'attr6'].each { attr -> - assert keys.contains(attr), "Missing attribute: ${attr}" - } - } - - def "test numeric conversion with edge cases: #description"() { - given: - def context = new AppSecRequestContext() - def mockTraceSegment = Mock(datadog.trace.api.internal.TraceSegment) - def committedTags = [:] - - mockTraceSegment.setTagTop(_ as String, _ as Object) >> { String key, Object value -> - committedTags[key] = value - } - - when: - context.reportDerivatives(['test_attr': ['value': inputValue]]) - context.commitDerivatives(mockTraceSegment) - - then: - // When conversion fails (expectedValue is null), the original string value should be preserved - // When conversion succeeds, the converted numeric value should be used - committedTags['test_attr'] == (expectedValue != null ? expectedValue : inputValue) - - where: - description | inputValue | expectedValue - // Valid integers - 'zero' | '0' | 0L - 'positive integer' | '42' | 42L - 'negative integer' | '-100' | -100L - 'integer with plus sign' | '+999' | 999L - 'large valid long' | '9223372036854775807' | 9223372036854775807L - 'large negative long' | '-9223372036854775808' | -9223372036854775808L - - // Valid decimals - 'simple decimal' | '3.14' | 3.14d - 'negative decimal' | '-0.5' | -0.5d - 'decimal with plus sign' | '+99.99' | 99.99d - 'zero decimal' | '0.0' | 0.0d - 'decimal with many digits' | '123.456789' | 123.456789d - - // Whitespace handling (should now parse after trim - issue #10494 fix) - 'leading whitespace integer' | ' 42' | 42L - 'trailing whitespace integer' | '42 ' | 42L - 'both whitespace integer' | ' 42 ' | 42L - 'tab and newline whitespace' | '\t100\n' | 100L - 'multiple spaces decimal' | ' -3.14 ' | -3.14d - - // Empty and null - 'null value' | null | null - 'empty string' | '' | null - 'whitespace only' | ' ' | null - 'tab only' | '\t' | null - - // Invalid formats (should return null, original string preserved) - 'alphabetic string' | 'abc' | null - 'alphanumeric string' | '12x34' | null - 'multiple decimals' | '3.14.15' | null - 'multiple signs' | '+-5' | null - 'sign in middle' | '12-34' | null - - // Sign-only strings - 'plus sign only' | '+' | null - 'minus sign only' | '-' | null - 'plus with whitespace' | ' + ' | null - - // Overflow cases (should return null gracefully) - 'long overflow positive' | '9223372036854775808' | null - 'long overflow negative' | '-9223372036854775809' | null - 'very large number' | '99999999999999999999999' | null - - // Scientific notation (now supported for backward compatibility) - 'scientific notation lowercase' | '1e10' | 1.0e10d - 'scientific notation uppercase' | '1E10' | 1.0E10d - 'scientific with decimal' | '1.5e10' | 1.5e10d - 'scientific negative exponent' | '3.5E-7' | 3.5E-7d - 'scientific with sign' | '-2.5e+3' | -2.5e+3d - 'scientific integer base' | '5e3' | 5000.0d - - // Exotic number formats (not supported) - 'hexadecimal' | '0x10' | null - 'binary' | '0b1010' | null - 'octal' | '0777' | 777L - - // Edge decimal cases (note: .5 and 5. are valid Java double literals) - 'decimal starts with dot' | '.5' | 0.5d - 'decimal ends with dot' | '5.' | 5.0d - 'dot only' | '.' | null - 'multiple dots' | '...' | null - - // Regression - ensure existing valid formats still work - 'regression valid integer' | '100' | 100L - 'regression valid decimal' | '99.5' | 99.5d - 'regression negative' | '-50' | -50L - - // Special characters - 'comma separator' | '1,000' | null - 'underscore separator' | '1_000' | null - 'currency symbol' | '$100' | null - 'percentage' | '50%' | null - - // Edge cases with zeros - 'zero with plus' | '+0' | 0L - 'zero with minus' | '-0' | 0L - 'decimal zero variations' | '0.00' | 0.0d - } - - def "test getDerivativeKeys with empty derivatives"() { - given: - def context = new AppSecRequestContext() - - when: - def keys = context.getDerivativeKeys() - - then: - keys.isEmpty() - } - - def "test reportDerivatives with extracted values from request data"() { - given: - def context = new AppSecRequestContext() - context.setMethod("POST") - context.addRequestHeader("x-custom-header", "custom_value") - - def derivatives = [ - 'extracted_method': [ - 'address': 'server.request.method' - ], - 'extracted_header': [ - 'address': 'server.request.headers', - 'key_path': ['x-custom-header'] - ] - ] - - when: - context.reportDerivatives(derivatives) - def keys = context.getDerivativeKeys() - - then: - keys.size() == 2 - keys.contains('extracted_method') - keys.contains('extracted_header') - } - - def "test reportDerivatives with transformers"() { - given: - def context = new AppSecRequestContext() - context.addRequestHeader("user-agent", "Mozilla/5.0") - - def derivatives = [ - 'ua_lowercase': [ - 'address': 'server.request.headers', - 'key_path': ['user-agent'], - 'transformers': ['lowercase'] - ], - 'ua_uppercase': [ - 'address': 'server.request.headers', - 'key_path': ['user-agent'], - 'transformers': ['uppercase'] - ] - ] - - when: - context.reportDerivatives(derivatives) - def keys = context.getDerivativeKeys() - - then: - keys.size() == 2 - keys.contains('ua_lowercase') - keys.contains('ua_uppercase') - } -} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java new file mode 100644 index 00000000000..39c24cf95ab --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/api/security/LambdaApiSecurityForkedTest.java @@ -0,0 +1,118 @@ +package com.datadog.appsec.api.security; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.mockito.Mockito.mock; + +import com.datadog.appsec.AppSecSystem; +import datadog.communication.ddagent.DDAgentFeaturesDiscovery; +import datadog.communication.ddagent.SharedCommunicationObjects; +import datadog.metrics.api.Monitoring; +import datadog.remoteconfig.ConfigurationPoller; +import datadog.trace.api.Config; +import datadog.trace.api.gateway.RequestContextSlot; +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.SpanPostProcessor; +import datadog.trace.common.writer.ListWriter; +import datadog.trace.core.CoreTracer; +import datadog.trace.core.DDSpan; +import datadog.trace.lambda.LambdaAppSecHandler; +import datadog.trace.test.junit.utils.config.WithConfig; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.nio.charset.StandardCharsets; +import okhttp3.OkHttpClient; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +@WithConfig(key = "api-security.enabled", value = "true") +@WithConfig(key = "api-security.sample.delay", value = "0") +class LambdaApiSecurityForkedTest { + + private static final String REQUEST_SCHEMA_TAG = "_dd.appsec.s.req.body"; + private static final String RESPONSE_SCHEMA_TAG = "_dd.appsec.s.res.body"; + private static final String RESPONSE_HEADERS_SCHEMA_TAG = "_dd.appsec.s.res.headers"; + + private AgentTracer.TracerAPI originalTracer; + private CoreTracer tracer; + private ListWriter writer; + + @BeforeEach + void setUp() { + originalTracer = AgentTracer.get(); + writer = new ListWriter(); + tracer = CoreTracer.builder().writer(writer).build(); + AgentTracer.forceRegister(tracer); + AppSecSystem.start( + tracer.getSubscriptionService(RequestContextSlot.APPSEC), sharedCommunicationObjects()); + } + + @AfterEach + void tearDown() { + AppSecSystem.stop(); + // stop() leaves the flag set; reset it so the state cannot leak between tests + ActiveSubsystems.APPSEC_ACTIVE = false; + SpanPostProcessor.Holder.INSTANCE = SpanPostProcessor.Holder.NOOP; + AgentTracer.forceRegister(originalTracer); + tracer.close(); + } + + @Test + void generatesSchemasAndInfersSuccessForHttpApiV2Invocation() throws Exception { + String eventJson = + "{" + + "\"version\":\"2.0\"," + + "\"routeKey\":\"POST /api/users/{id}\"," + + "\"rawPath\":\"/api/users/123\"," + + "\"headers\":{\"content-type\":\"application/json\"," + + "\"host\":\"api.example.com\"}," + + "\"pathParameters\":{\"id\":\"123\"}," + + "\"body\":\"{\\\"name\\\":\\\"Ada\\\",\\\"age\\\":37}\"," + + "\"requestContext\":{\"domainName\":\"api.example.com\"," + + "\"http\":{\"method\":\"POST\",\"path\":\"/api/users/123\"," + + "\"sourceIp\":\"203.0.113.1\"}}" + + "}"; + ByteArrayInputStream input = + new ByteArrayInputStream(eventJson.getBytes(StandardCharsets.UTF_8)); + + AgentSpanContext parent = LambdaAppSecHandler.processRequestStart(input); + assertNotNull(parent); + AgentSpan span = AgentTracer.startSpan("aws-lambda", "aws.lambda.invoke", parent); + + String responseJson = "{\"id\":123,\"active\":true}"; + ByteArrayOutputStream output = new ByteArrayOutputStream(); + output.write(responseJson.getBytes(StandardCharsets.UTF_8)); + + LambdaAppSecHandler.processResponseData(span, output); + LambdaAppSecHandler.processRequestEnd(span); + // TraceProcessingWorker invokes this after request end in production. ListWriter deliberately + // bypasses that worker, so invoke the registered real post-processor here. + SpanPostProcessor.Holder.INSTANCE.process(span, () -> false); + span.finish(); + + writer.waitForTraces(1); + DDSpan finishedSpan = writer.firstTrace().get(0); + assertEquals(200, ((Number) finishedSpan.getTag("http.status_code")).intValue()); + assertNotNull(finishedSpan.getTag(REQUEST_SCHEMA_TAG)); + assertNotNull(finishedSpan.getTag(RESPONSE_SCHEMA_TAG)); + assertNotNull(finishedSpan.getTag(RESPONSE_HEADERS_SCHEMA_TAG)); + } + + private SharedCommunicationObjects sharedCommunicationObjects() { + SharedCommunicationObjects sco = + new SharedCommunicationObjects() { + @Override + public ConfigurationPoller configurationPoller(Config config) { + return mock(ConfigurationPoller.class); + } + }; + sco.agentHttpClient = mock(OkHttpClient.class); + sco.monitoring = mock(Monitoring.class); + sco.setFeaturesDiscovery(mock(DDAgentFeaturesDiscovery.class)); + return sco; + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java new file mode 100644 index 00000000000..ac81cb2f0b8 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/ddwaf/MoshiReflectiveDtoContractTest.java @@ -0,0 +1,45 @@ +package com.datadog.appsec.ddwaf; + +import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; + +import com.datadog.appsec.report.AppSecEvent; +import com.datadog.appsec.report.AppSecEventWrapper; +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.Test; + +/** + * Guards the no-arg constructor contract documented on {@link WAFResultData} and {@link + * AppSecEventWrapper}, which the Moshi reflective adapters depend on. + * + *

The runtime that exposes a breach of it — one that does not resolve the {@code + * jdk.unsupported} module, leaving Moshi no {@code sun.misc.Unsafe} fallback — cannot be simulated + * from inside a running JVM, so this asserts the contract directly instead. + */ +class MoshiReflectiveDtoContractTest { + + /** + * Every class reached by the reflective adapters in {@code WAFModule} and {@code + * AppSecEventWrapper}. + */ + private static final List> REFLECTIVELY_INSTANTIATED = + Arrays.asList( + WAFResultData.class, + WAFResultData.Rule.class, + WAFResultData.RuleMatch.class, + WAFResultData.Parameter.class, + WAFResultData.MatchInfo.class, + AppSecEventWrapper.class, + AppSecEvent.class); + + @Test + void everyReflectivelyBoundDtoDeclaresANoArgConstructor() { + for (Class clazz : REFLECTIVELY_INSTANTIATED) { + assertDoesNotThrow( + () -> { + clazz.getDeclaredConstructor(); + }, + clazz.getName() + " must declare a no-arg constructor for Moshi"); + } + } +} diff --git a/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java new file mode 100644 index 00000000000..a8a290ff4d9 --- /dev/null +++ b/dd-java-agent/appsec/src/test/java/com/datadog/appsec/gateway/AppSecRequestContextTest.java @@ -0,0 +1,985 @@ +package com.datadog.appsec.gateway; + +import static datadog.trace.api.telemetry.LogCollector.SEND_TELEMETRY; +import static java.util.Arrays.asList; +import static java.util.Collections.emptyMap; +import static java.util.Collections.singleton; +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; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNotSame; +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; +import static org.junit.jupiter.params.provider.Arguments.arguments; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +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.when; + +import com.datadog.appsec.ddwaf.WafInitialization; +import com.datadog.appsec.event.data.Address; +import com.datadog.appsec.event.data.KnownAddresses; +import com.datadog.appsec.event.data.MapDataBundle; +import com.datadog.appsec.report.AppSecEvent; +import com.datadog.ddwaf.Waf; +import com.datadog.ddwaf.WafBuilder; +import com.datadog.ddwaf.WafContext; +import com.squareup.moshi.JsonAdapter; +import com.squareup.moshi.Moshi; +import com.squareup.moshi.Types; +import datadog.trace.api.Config; +import datadog.trace.api.internal.TraceSegment; +import datadog.trace.test.logging.CapturedLog; +import datadog.trace.test.logging.TestLogCollector; +import datadog.trace.util.stacktrace.StackTraceEvent; +import datadog.trace.util.stacktrace.StackTraceFrame; +import java.io.Closeable; +import java.io.InputStream; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import java.util.Set; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.atomic.AtomicReference; +import java.util.stream.Stream; +import okio.Okio; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Nested; +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 AppSecRequestContextTest { + + private static final JsonAdapter> ADAPTER = + new Moshi.Builder() + .build() + .adapter(Types.newParameterizedType(Map.class, String.class, Object.class)); + + private final AppSecRequestContext ctx = new AppSecRequestContext(); + private WafBuilder wafBuilder; + + @AfterEach + void tearDown() { + if (wafBuilder != null) { + wafBuilder.close(); + } + } + + @Test + void implementsDataBundle() { + ctx.addAll(MapDataBundle.of(KnownAddresses.REQUEST_URI_RAW, "/a")); + + assertEquals(1, ctx.size()); + assertEquals("/a", ctx.get(KnownAddresses.REQUEST_URI_RAW)); + assertEquals( + singletonList(KnownAddresses.REQUEST_URI_RAW), new ArrayList<>(ctx.getAllAddresses())); + assertTrue(ctx.hasAddress(KnownAddresses.REQUEST_URI_RAW)); + + Iterator, Object>> iterator = ctx.iterator(); + + assertTrue(iterator.hasNext()); + + Map.Entry, Object> element = iterator.next(); + + assertEquals(KnownAddresses.REQUEST_URI_RAW, element.getKey()); + assertEquals("/a", element.getValue()); + } + + @Test + void itIsCloseable() { + assertInstanceOf(Closeable.class, ctx); + + // close() on a context that was never used must not throw. + ctx.close(); + } + + @Test + void addingHeadersAfterTheyAreSaidToBeFinishedIsForbidden() { + ctx.finishRequestHeaders(); + + assertTrue(ctx.isFinishedRequestHeaders()); + assertThrows(IllegalStateException.class, () -> ctx.addRequestHeader("a", "b")); + assertThrows( + IllegalStateException.class, () -> ctx.addCookies(singletonMap("a", singletonList("b")))); + } + + @Test + void settingUriASecondTimeIsIgnoredFirstValueWins() { + ctx.setRawURI("/a"); + ctx.setRawURI("/b"); + + assertEquals("/a", ctx.getSavedRawURI()); + } + + @Test + void savesCookiesAndOtherHeaders() { + ctx.addCookies(singletonMap("a", singletonList("c"))); + ctx.addRequestHeader("user-agent", "foo"); + + assertEquals(singletonList("foo"), ctx.getRequestHeaders().get("user-agent")); + assertEquals(singletonMap("a", singletonList("c")), ctx.getCookies()); + } + + @Test + void canSaveTheUri() { + // The Groovy original assigned the private savedRawURI field; setRawURI is its only writer. + ctx.setRawURI("/a"); + + assertEquals("/a", ctx.getSavedRawURI()); + } + + @Test + void canCollectEvents() { + ctx.reportEvents(asList(new AppSecEvent(), new AppSecEvent())); + Collection events = ctx.transferCollectedEvents(); + + assertEquals(2, events.size()); + for (AppSecEvent event : events) { + assertNotNull(event); + } + + ctx.reportEvents(singletonList(new AppSecEvent())); + events = ctx.transferCollectedEvents(); + + assertEquals(1, events.size()); + assertNotNull(events.iterator().next()); + } + + @Test + void collectEventsWhenNoneReported() { + assertTrue(ctx.transferCollectedEvents().isEmpty()); + } + + @Test + void canCollectStackTraces() { + StackTraceElement element = new StackTraceElement("class", "method", "file", 1); + StackTraceFrame frame = new StackTraceFrame(1, element); + StackTraceEvent event = new StackTraceEvent(singletonList(frame), "java", "id", "message"); + + ctx.reportStackTrace(event); + List result = ctx.getStackTraces(); + + assertEquals(1, result.size()); + StackTraceEvent reportedEvent = result.get(0); + assertEquals("id", reportedEvent.getId()); + assertEquals("message", reportedEvent.getMessage()); + assertEquals("java", reportedEvent.getLanguage()); + assertEquals(1, reportedEvent.getFrames().size()); + StackTraceFrame reportedFrame = reportedEvent.getFrames().get(0); + assertEquals(1, reportedFrame.getId()); + assertEquals("class.method(file:1)", reportedFrame.getText()); + assertEquals("file", reportedFrame.getFile()); + assertEquals(Integer.valueOf(1), reportedFrame.getLine()); + assertEquals("class", reportedFrame.getClass_name()); + assertEquals("method", reportedFrame.getFunction()); + } + + @Test + void collectStackTracesWhenNoneReported() { + assertNull(ctx.getStackTraces()); + } + + @ParameterizedTest(name = "{0} allow list contains only lowercase names") + @MethodSource("headersAllowListShouldContainOnlyLowercaseNamesArguments") + void headersAllowListShouldContainOnlyLowercaseNames(String name, Set headers) { + for (String header : headers) { + assertEquals( + header.toLowerCase(Locale.ROOT), + header, + "REASON: Allow header name \"" + header + "\" MUST be lowercase"); + } + } + + private static Stream headersAllowListShouldContainOnlyLowercaseNamesArguments() { + return Stream.of( + arguments( + "Default request headers", AppSecRequestContext.DEFAULT_REQUEST_HEADERS_ALLOW_LIST), + arguments("Request headers", AppSecRequestContext.REQUEST_HEADERS_ALLOW_LIST), + arguments("Response headers", AppSecRequestContext.RESPONSE_HEADERS_ALLOW_LIST)); + } + + @Test + void basicHeadersCollectionTest() { + ctx.addRequestHeader("Host", "127.0.0.1"); + ctx.addRequestHeader("Content-Type", "text/html; charset=UTF-8"); + ctx.addRequestHeader("Custom-Header", "value1"); + ctx.addRequestHeader("Accept", "application/json"); + + Map> expected = new HashMap<>(); + expected.put("host", singletonList("127.0.0.1")); + expected.put("content-type", singletonList("text/html; charset=UTF-8")); + expected.put("custom-header", singletonList("value1")); + expected.put("accept", singletonList("application/json")); + assertEquals(expected, ctx.getRequestHeaders()); + } + + @Test + void nullHeadersShouldBeIgnored() { + ctx.addRequestHeader(null, "value"); + ctx.addRequestHeader("key", null); + + assertTrue(ctx.getRequestHeaders().isEmpty()); + } + + @Test + void concatMultipleValuesForSameHeader() { + ctx.addRequestHeader("Custom-Header", "value1"); + ctx.addRequestHeader("CUSTOM-HEADER", "value2"); + ctx.addRequestHeader("Accept", "application/json"); + ctx.addRequestHeader("accept", "application/xml"); + + Map> expected = new HashMap<>(); + expected.put("custom-header", asList("value1", "value2")); + expected.put("accept", asList("application/json", "application/xml")); + assertEquals(expected, ctx.getRequestHeaders()); + } + + private WafContext createWafContext(AppSecRequestContext context) throws Exception { + assertTrue(WafInitialization.ONLINE, "libddwaf must be available for this test"); + Waf.initialize(false); + if (wafBuilder != null) { + wafBuilder.close(); + } + wafBuilder = new WafBuilder(); + try (InputStream stream = + getClass().getClassLoader().getResourceAsStream("test_multi_config.json")) { + wafBuilder.addOrUpdateConfig("test", ADAPTER.fromJson(Okio.buffer(Okio.source(stream)))); + } + return context.getOrCreateWafContext(wafBuilder.buildWafHandleInstance(), false, false); + } + + @Test + void closeClosesTheWafContext() throws Exception { + WafContext wafContext = createWafContext(ctx); + + ctx.close(); + + // isWafContextClosed() is the public witness for the nulled wafContext field. + assertTrue(ctx.isWafContextClosed()); + assertFalse(wafContext.isOnline()); + } + + @Test + void testIsThrottled() { + RateLimiter rateLimiter = mock(RateLimiter.class); + when(rateLimiter.isThrottled()).thenReturn(true); + AppSecRequestContext appSecRequestContext = new AppSecRequestContext(); + + // rate limiter is called and throttled is set + boolean result = appSecRequestContext.isThrottled(rateLimiter); + + assertTrue(result); + + // rate limiter is not called more than once per appsec context, returns first result + boolean secondResult = appSecRequestContext.isThrottled(rateLimiter); + + assertEquals(result, secondResult); + verify(rateLimiter, times(1)).isThrottled(); + } + + @Test + void testThatInternalDataIsReleasedOnClose() throws Exception { + AppSecRequestContext context = new AppSecRequestContext(); + + context.addRequestHeader("Accept", "*"); + context.addResponseHeader("Content-Type", "text/plain"); + context.addCookies(singletonMap("cookie", singletonList("test"))); + context.addAll(MapDataBundle.of(KnownAddresses.REQUEST_METHOD, "GET")); + // Use reportDerivatives to properly set values via AtomicReference + context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value"))); + WafContext wafContext = createWafContext(context); + context.close(); + + assertTrue(context.isWafContextClosed()); + assertFalse(wafContext.isOnline()); + // Check that derivatives AtomicReference contains null after close + assertNull(derivativesField(context).get()); + + // Field access, not the getter: it null-coalesces, so emptiness would prove nothing. + assertNull(requestHeadersField(context)); + assertNull(responseHeadersField(context)); + assertTrue(context.getCookies().isEmpty()); + assertEquals(0, context.size()); + } + + @Test + void testIncreaseAndGetWafTimeouts() { + ctx.increaseWafTimeouts(); + ctx.increaseWafTimeouts(); + + assertEquals(2, ctx.getWafTimeouts()); + } + + @Test + void testIncreaseAndGetRaspTimeouts() { + ctx.increaseRaspTimeouts(); + ctx.increaseRaspTimeouts(); + + assertEquals(2, ctx.getRaspTimeouts()); + } + + @Test + void closeLogsIfRequestEndWasNotCalled() { + TestLogCollector.enable(); + try { + AppSecRequestContext context = new AppSecRequestContext(); + + context.close(); + + CapturedLog releaseLog = null; + for (CapturedLog captured : TestLogCollector.drainCapturedLogs()) { + if (captured.message.contains("Request end event was not called before close")) { + releaseLog = captured; + break; + } + } + assertNotNull(releaseLog); + assertEquals(SEND_TELEMETRY, releaseLog.marker); + } finally { + TestLogCollector.disable(); + } + } + + @Test + void testThatProcessedAttributesAreClearedOnClose() { + Map derivatives = new HashMap<>(); + derivatives.put("numeric", "42"); + derivatives.put("string", "value"); + + ctx.reportDerivatives(derivatives); + ctx.close(); + + assertTrue(ctx.getDerivativeKeys().isEmpty()); + } + + @Test + void testAttributeHandlingWithLiteralValuesAndRequestDataExtraction() { + AppSecRequestContext context = new AppSecRequestContext(); + context.setMethod("POST"); + context.setScheme("https"); + context.setRawURI("/api/test"); + context.setRoute("/api/{param}"); + context.setResponseStatus(200); + context.addRequestHeader("user-agent", "TestAgent/1.0"); + context.addRequestHeader("content-type", "application/json"); + + // Test data for attributes + Map attributes = new HashMap<>(); + attributes.put("_dd.appsec.s.res.headers", literalValue("literal-header-value")); + attributes.put("_dd.appsec.s.res.method", addressValue("server.request.method")); + attributes.put("_dd.appsec.s.res.scheme", addressValue("server.request.scheme")); + attributes.put("_dd.appsec.s.res.uri", addressValue("server.request.uri.raw")); + attributes.put("_dd.appsec.s.res.route", addressValue("server.request.route")); + attributes.put("_dd.appsec.s.res.status", addressValue("server.response.status")); + attributes.put("_dd.appsec.s.res.user_agent", headerValue("user-agent", null)); + attributes.put("_dd.appsec.s.res.content_type", headerValue("content-type", null)); + attributes.put("_dd.appsec.s.res.user_agent_lower", headerValue("user-agent", "lowercase")); + attributes.put("_dd.appsec.s.res.content_type_upper", headerValue("content-type", "uppercase")); + + context.reportDerivatives(attributes); + Set keys = context.getDerivativeKeys(); + + assertEquals(new HashSet<>(attributes.keySet()), keys); + } + + @Test + void testAttributeHandlingWithUnknownAddress() { + AppSecRequestContext context = new AppSecRequestContext(); + Map attributes = + singletonMap("_dd.appsec.s.res.unknown", addressValue("server.request.unknown")); + + context.reportDerivatives(attributes); + Set keys = context.getDerivativeKeys(); + + // No attributes should be added for unknown addresses + assertTrue(keys.isEmpty()); + } + + @Test + void testAttributeHandlingWithInvalidKeyPath() { + AppSecRequestContext context = new AppSecRequestContext(); + context.addRequestHeader("user-agent", "TestAgent/1.0"); + Map attributes = + singletonMap("_dd.appsec.s.res.invalid", headerValue("non-existent-header", null)); + + context.reportDerivatives(attributes); + Set keys = context.getDerivativeKeys(); + + // No attributes should be added for invalid key paths + assertTrue(keys.isEmpty()); + } + + @Test + void testSamplingOfRequests() { + int maxRequests = Config.get().getApiSecurityMaxDownstreamRequestBodyAnalysis(); + AppSecRequestContext context = new AppSecRequestContext(); + Random random = new Random(); + Map sampledByRequestId = new HashMap<>(); + + for (int request = 0; request <= maxRequests; request++) { + long requestId = random.nextLong(); + sampledByRequestId.put(requestId, context.sampleHttpClientRequest(requestId)); + } + + int sampledCount = 0; + for (Boolean sampled : sampledByRequestId.values()) { + if (sampled) { + sampledCount++; + } + } + assertEquals(maxRequests, sampledCount); + for (Map.Entry entry : sampledByRequestId.entrySet()) { + assertEquals(entry.getValue(), context.isHttpClientRequestSampled(entry.getKey())); + } + } + + @Test + void testCommitDerivativesWithDifferentValueTypes() { + AppSecRequestContext context = new AppSecRequestContext(); + TraceSegment traceSegment = mock(TraceSegment.class); + // Capture what setTagTop is being called with + Map committedTags = captureCommittedTags(traceSegment); + + // Set up derivatives with different types + Map derivatives = new HashMap<>(); + derivatives.put("numeric_int", literalValue(42)); + derivatives.put("numeric_double", literalValue(3.14)); + derivatives.put("string_value", literalValue("test_string")); + derivatives.put("boolean_true", literalValue(true)); + derivatives.put("boolean_false", literalValue(false)); + derivatives.put("numeric_string", literalValue("100")); + derivatives.put("double_string", literalValue("99.5")); + derivatives.put("non_numeric_string", literalValue("not_a_number")); + + context.reportDerivatives(derivatives); + boolean result = context.commitDerivatives(traceSegment); + + assertTrue(result); + assertEquals(8, committedTags.size()); + + // Verify numeric values are preserved as numbers + assertEquals(42, committedTags.get("numeric_int")); + assertInstanceOf(Integer.class, committedTags.get("numeric_int")); + + // Unlike Groovy, where 3.14 is a BigDecimal, Java gives a Double - both are Numbers + assertEquals(3.14, committedTags.get("numeric_double")); + assertInstanceOf(Number.class, committedTags.get("numeric_double")); + + // Verify strings are handled correctly + assertEquals("test_string", committedTags.get("string_value")); + assertInstanceOf(String.class, committedTags.get("string_value")); + + // Verify booleans are preserved + assertEquals(true, committedTags.get("boolean_true")); + assertInstanceOf(Boolean.class, committedTags.get("boolean_true")); + + assertEquals(false, committedTags.get("boolean_false")); + assertInstanceOf(Boolean.class, committedTags.get("boolean_false")); + + // Verify numeric strings are converted to numbers + assertEquals(100L, committedTags.get("numeric_string")); + assertInstanceOf(Long.class, committedTags.get("numeric_string")); + + assertEquals(99.5, committedTags.get("double_string")); + assertInstanceOf(Number.class, committedTags.get("double_string")); + + // Verify non-numeric strings remain strings + assertEquals("not_a_number", committedTags.get("non_numeric_string")); + assertInstanceOf(String.class, committedTags.get("non_numeric_string")); + } + + @Test + void testCommitDerivativesClearsDerivativesAtomically() { + AppSecRequestContext context = new AppSecRequestContext(); + TraceSegment traceSegment = mock(TraceSegment.class); + Map derivatives = new HashMap<>(); + derivatives.put("attr1", literalValue("value1")); + derivatives.put("attr2", literalValue("value2")); + + context.reportDerivatives(derivatives); + + assertEquals(2, context.getDerivativeKeys().size()); + + context.commitDerivatives(traceSegment); + + // Derivatives should be cleared after commit + assertTrue(context.getDerivativeKeys().isEmpty()); + assertNull(derivativesField(context).get()); + } + + @Test + void testCommitDerivativesWithNullTraceSegmentReturnsFalse() { + AppSecRequestContext context = new AppSecRequestContext(); + + assertFalse(context.commitDerivatives(null)); + } + + @Test + void testMultipleReportDerivativesCallsAccumulateValues() { + AppSecRequestContext context = new AppSecRequestContext(); + + // First report + Map firstReport = new HashMap<>(); + firstReport.put("attr1", literalValue("value1")); + firstReport.put("attr2", literalValue("value2")); + context.reportDerivatives(firstReport); + + assertEquals(new HashSet<>(asList("attr1", "attr2")), context.getDerivativeKeys()); + + // Second report - should accumulate + Map secondReport = new HashMap<>(); + secondReport.put("attr3", literalValue("value3")); + secondReport.put("attr4", literalValue("value4")); + context.reportDerivatives(secondReport); + + assertEquals( + new HashSet<>(asList("attr1", "attr2", "attr3", "attr4")), context.getDerivativeKeys()); + } + + @Test + void testMultipleReportDerivativesWithOverlappingKeysUsesLastValue() { + AppSecRequestContext context = new AppSecRequestContext(); + TraceSegment traceSegment = mock(TraceSegment.class); + Map committedTags = captureCommittedTags(traceSegment); + + // First report + context.reportDerivatives(singletonMap("attr1", literalValue("first_value"))); + // Second report with same key - should overwrite + context.reportDerivatives(singletonMap("attr1", literalValue("second_value"))); + context.commitDerivatives(traceSegment); + + assertEquals("second_value", committedTags.get("attr1")); + } + + @Test + void testReportDerivativesMaintainsDataIntegrityUnderConcurrentAccess() throws Exception { + AppSecRequestContext context = new AppSecRequestContext(); + int numThreads = 3; + CountDownLatch startLatch = new CountDownLatch(1); + + // Simulate concurrent updates from multiple threads + ExecutorService executorService = Executors.newFixedThreadPool(numThreads); + List> futures = new ArrayList<>(); + try { + for (int thread = 0; thread < numThreads; thread++) { + int firstAttribute = thread * 2 + 1; + futures.add( + executorService.submit( + () -> { + startLatch.await(); // Wait for all threads to be ready + context.reportDerivatives( + singletonMap( + "attr" + firstAttribute, literalValue("value" + firstAttribute))); + context.reportDerivatives( + singletonMap( + "attr" + (firstAttribute + 1), + literalValue("value" + (firstAttribute + 1)))); + return null; + })); + } + + // Release all threads at once to maximize concurrent execution + startLatch.countDown(); + + // Wait for all tasks to complete using the futures + for (Future future : futures) { + future.get(); + } + } finally { + executorService.shutdown(); + } + + // Verify all attributes were added despite concurrent access + Set keys = context.getDerivativeKeys(); + // At least the 6 we explicitly added + assertTrue(keys.size() >= 6, "expected at least 6 derivative keys, got " + keys); + for (int attribute = 1; attribute <= 6; attribute++) { + assertTrue(keys.contains("attr" + attribute), "Missing attribute: attr" + attribute); + } + } + + @ParameterizedTest(name = "numeric conversion with edge cases: {0}") + @MethodSource("testNumericConversionWithEdgeCasesArguments") + void testNumericConversionWithEdgeCases( + String description, String inputValue, Object expectedValue) { + AppSecRequestContext context = new AppSecRequestContext(); + TraceSegment traceSegment = mock(TraceSegment.class); + Map committedTags = captureCommittedTags(traceSegment); + + context.reportDerivatives(singletonMap("test_attr", literalValue(inputValue))); + context.commitDerivatives(traceSegment); + + // When conversion fails (expectedValue is null), the original string value should be preserved + // When conversion succeeds, the converted numeric value should be used + assertEquals( + expectedValue != null ? expectedValue : inputValue, committedTags.get("test_attr")); + } + + private static Stream testNumericConversionWithEdgeCasesArguments() { + return Stream.of( + // Valid integers + arguments("zero", "0", 0L), + arguments("positive integer", "42", 42L), + arguments("negative integer", "-100", -100L), + arguments("integer with plus sign", "+999", 999L), + arguments("large valid long", "9223372036854775807", 9223372036854775807L), + arguments("large negative long", "-9223372036854775808", -9223372036854775808L), + + // Valid decimals + arguments("simple decimal", "3.14", 3.14d), + arguments("negative decimal", "-0.5", -0.5d), + arguments("decimal with plus sign", "+99.99", 99.99d), + arguments("zero decimal", "0.0", 0.0d), + arguments("decimal with many digits", "123.456789", 123.456789d), + + // Whitespace handling (should now parse after trim - issue #10494 fix) + arguments("leading whitespace integer", " 42", 42L), + arguments("trailing whitespace integer", "42 ", 42L), + arguments("both whitespace integer", " 42 ", 42L), + arguments("tab and newline whitespace", "\t100\n", 100L), + arguments("multiple spaces decimal", " -3.14 ", -3.14d), + + // Empty and null + arguments("null value", null, null), + arguments("empty string", "", null), + arguments("whitespace only", " ", null), + arguments("tab only", "\t", null), + + // Invalid formats (should return null, original string preserved) + arguments("alphabetic string", "abc", null), + arguments("alphanumeric string", "12x34", null), + arguments("multiple decimals", "3.14.15", null), + arguments("multiple signs", "+-5", null), + arguments("sign in middle", "12-34", null), + + // Sign-only strings + arguments("plus sign only", "+", null), + arguments("minus sign only", "-", null), + arguments("plus with whitespace", " + ", null), + + // Overflow cases (should return null gracefully) + arguments("long overflow positive", "9223372036854775808", null), + arguments("long overflow negative", "-9223372036854775809", null), + arguments("very large number", "99999999999999999999999", null), + + // Scientific notation (now supported for backward compatibility) + arguments("scientific notation lowercase", "1e10", 1.0e10d), + arguments("scientific notation uppercase", "1E10", 1.0E10d), + arguments("scientific with decimal", "1.5e10", 1.5e10d), + arguments("scientific negative exponent", "3.5E-7", 3.5E-7d), + arguments("scientific with sign", "-2.5e+3", -2.5e+3d), + arguments("scientific integer base", "5e3", 5000.0d), + + // Exotic number formats (not supported) + arguments("hexadecimal", "0x10", null), + arguments("binary", "0b1010", null), + arguments("octal", "0777", 777L), + + // Edge decimal cases (note: .5 and 5. are valid Java double literals) + arguments("decimal starts with dot", ".5", 0.5d), + arguments("decimal ends with dot", "5.", 5.0d), + arguments("dot only", ".", null), + arguments("multiple dots", "...", null), + + // Regression - ensure existing valid formats still work + arguments("regression valid integer", "100", 100L), + arguments("regression valid decimal", "99.5", 99.5d), + arguments("regression negative", "-50", -50L), + + // Special characters + arguments("comma separator", "1,000", null), + arguments("underscore separator", "1_000", null), + arguments("currency symbol", "$100", null), + arguments("percentage", "50%", null), + + // Edge cases with zeros + arguments("zero with plus", "+0", 0L), + arguments("zero with minus", "-0", 0L), + arguments("decimal zero variations", "0.00", 0.0d)); + } + + @Test + void testGetDerivativeKeysWithEmptyDerivatives() { + AppSecRequestContext context = new AppSecRequestContext(); + + assertTrue(context.getDerivativeKeys().isEmpty()); + } + + @Test + void testReportDerivativesWithExtractedValuesFromRequestData() { + AppSecRequestContext context = new AppSecRequestContext(); + context.setMethod("POST"); + context.addRequestHeader("x-custom-header", "custom_value"); + + Map derivatives = new HashMap<>(); + derivatives.put("extracted_method", addressValue("server.request.method")); + derivatives.put("extracted_header", headerValue("x-custom-header", null)); + + context.reportDerivatives(derivatives); + Set keys = context.getDerivativeKeys(); + + assertEquals(new HashSet<>(asList("extracted_method", "extracted_header")), keys); + } + + @Test + void testReportDerivativesWithTransformers() { + AppSecRequestContext context = new AppSecRequestContext(); + context.addRequestHeader("user-agent", "Mozilla/5.0"); + + Map derivatives = new HashMap<>(); + derivatives.put("ua_lowercase", headerValue("user-agent", "lowercase")); + derivatives.put("ua_uppercase", headerValue("user-agent", "uppercase")); + + context.reportDerivatives(derivatives); + Set keys = context.getDerivativeKeys(); + + assertEquals(new HashSet<>(asList("ua_lowercase", "ua_uppercase")), keys); + } + + /** A derivative schema holding a literal value, reported as-is. */ + private static Map literalValue(Object value) { + return singletonMap("value", value); + } + + /** A derivative schema extracting the whole value stored at the given address. */ + private static Map addressValue(String address) { + return singletonMap("address", address); + } + + /** + * A derivative schema extracting one request header, optionally through a transformer. + * + * @param transformer the transformer to apply, or {@code null} for none + */ + private static Map headerValue(String header, String transformer) { + Map schema = new HashMap<>(); + schema.put("address", "server.request.headers"); + schema.put("key_path", singletonList(header)); + if (transformer != null) { + schema.put("transformers", singletonList(transformer)); + } + return schema; + } + + /** Records every {@code setTagTop} call on the mock into the returned map. */ + private static Map captureCommittedTags(TraceSegment traceSegment) { + Map committedTags = new HashMap<>(); + doAnswer( + invocation -> { + committedTags.put(invocation.getArgument(0), invocation.getArgument(1)); + return null; + }) + .when(traceSegment) + .setTagTop(anyString(), any()); + return committedTags; + } + + /** + * Tests that {@link AppSecRequestContext#close()} releases the request/response header maps and + * the published derivatives map by replacing references rather than mutating them in place, so + * that a reader on the trace-processing thread cannot observe a collection being emptied + * mid-iteration (APPSEC-70134). + * + *

The assertions read the private fields reflectively on purpose: the invariant is about which + * instance the context still points at, and the accessors deliberately hide that (the header + * getters null-coalesce, and {@code getDerivativeKeys} exposes only a key view). + */ + @Nested + class ReleaseOnClose { + + @Test + void closeDoesNotMutateThePublishedDerivativesMap() { + AppSecRequestContext context = new AppSecRequestContext(); + context.reportDerivatives(singletonMap("test_attr", singletonMap("value", "test_value"))); + Map published = derivativesField(context).get(); + assertEquals(singleton("test_attr"), published.keySet()); + + context.close(); + + // The reference is detached, but the instance a concurrent reader holds is untouched. + assertNull(derivativesField(context).get()); + assertEquals(singleton("test_attr"), published.keySet()); + assertEquals("test_value", published.get("test_attr")); + } + + @Test + void closeReleasesTheHeaderMapsWithoutMutatingTheReaderSnapshots() { + AppSecRequestContext context = new AppSecRequestContext(); + context.addRequestHeader("accept", "*"); + context.addResponseHeader("content-type", "text/plain"); + Map> requestHeaders = context.getRequestHeaders(); + Map> responseHeaders = context.getResponseHeaders(); + + context.close(); + + // Readers holding these maps (e.g. async schema extraction) still see their contents. + assertEquals(singletonMap("accept", singletonList("*")), requestHeaders); + assertEquals(singletonMap("content-type", singletonList("text/plain")), responseHeaders); + + // The context dropped its own reference, so the contents are collectable. + assertNull(requestHeadersField(context)); + assertNull(responseHeadersField(context)); + } + + @Test + void closeReleasesTheHeaderMapsWithoutAllocatingReplacements() { + AppSecRequestContext context = new AppSecRequestContext(); + + // An untouched context holds no header maps at all. + assertNull(requestHeadersField(context)); + assertNull(responseHeadersField(context)); + + context.addRequestHeader("accept", "*"); + context.addResponseHeader("content-type", "text/plain"); + // close() runs twice per request: onRequestEnded, then onRootSpanPublished. + context.close(); + context.close(); + + assertNull(requestHeadersField(context)); + assertNull(responseHeadersField(context)); + // Readers see the shared empty map rather than a freshly allocated one. + assertSame(emptyMap(), context.getRequestHeaders()); + assertSame(emptyMap(), context.getResponseHeaders()); + } + + @Test + void addressExtractionAfterCloseDoesNotRematerialiseTheHeaderMaps() { + AppSecRequestContext context = new AppSecRequestContext(); + context.addRequestHeader("user-agent", "foo"); + context.close(); + + // A late WAF result extracts an attribute from a header address. + context.reportDerivatives( + singletonMap("_dd.appsec.s.res.user_agent", headerValue("user-agent", null))); + + // The address lookup read the released field instead of allocating a new map. + assertNull(requestHeadersField(context)); + assertSame(emptyMap(), context.getRequestHeaders()); + assertTrue(context.getDerivativeKeys().isEmpty()); + } + + @Test + void headersCanStillBeRecordedAfterClose() { + AppSecRequestContext context = new AppSecRequestContext(); + context.close(); + + // A late header arrives after the maps were released; it is accepted, as it was when close() + // cleared the maps in place. + context.addRequestHeader("accept", "*"); + context.addResponseHeader("content-type", "text/plain"); + + assertEquals(singletonMap("accept", singletonList("*")), context.getRequestHeaders()); + assertEquals( + singletonMap("content-type", singletonList("text/plain")), context.getResponseHeaders()); + } + + @Test + void reportDerivativesPublishesANewMapAndLeavesEarlierSnapshotsUntouched() { + AppSecRequestContext context = new AppSecRequestContext(); + context.reportDerivatives(singletonMap("attr1", literalValue("value1"))); + Map first = derivativesField(context).get(); + + context.reportDerivatives(singletonMap("attr2", literalValue("value2"))); + Map second = derivativesField(context).get(); + + assertNotSame(first, second); + assertEquals(singleton("attr1"), first.keySet()); + assertEquals(new HashSet<>(asList("attr1", "attr2")), second.keySet()); + } + + @Test + void publishedDerivativesMapRejectsMutation() { + AppSecRequestContext context = new AppSecRequestContext(); + context.reportDerivatives(singletonMap("test_attr", literalValue("test_value"))); + Map published = derivativesField(context).get(); + + assertThrows(UnsupportedOperationException.class, published::clear); + } + + @ParameterizedTest(name = "hasDerivativeKeyStartingWith: {0}") + @MethodSource("com.datadog.appsec.gateway.AppSecRequestContextTest#derivativePrefixScenarios") + void hasDerivativeKeyStartingWith( + String scenario, Map derivatives, boolean expected) { + AppSecRequestContext context = new AppSecRequestContext(); + context.reportDerivatives(derivatives); + + assertEquals(expected, context.hasDerivativeKeyStartingWith("_dd.appsec.s.")); + } + + @Test + void aNullDerivativeKeyIsStoredButNeverMatches() { + AppSecRequestContext context = new AppSecRequestContext(); + context.reportDerivatives(singletonMap(null, literalValue("x"))); + + assertTrue(context.getDerivativeKeys().contains(null)); + assertFalse(context.hasDerivativeKeyStartingWith("_dd.appsec.s.")); + } + } + + /** Declared on the outer class: {@code @MethodSource} factories must be static. */ + private static Stream derivativePrefixScenarios() { + Map severalKeys = new HashMap<>(); + severalKeys.put("_dd.appsec.fp.http.header", literalValue("x")); + severalKeys.put("_dd.appsec.s.req.body", literalValue("y")); + return Stream.of( + arguments("no derivatives reported", emptyMap(), false), + arguments("matching key", singletonMap("_dd.appsec.s.req.body", literalValue("x")), true), + arguments( + "non-matching key", + singletonMap("_dd.appsec.fp.http.header", literalValue("x")), + false), + arguments("one of several matches", severalKeys, true)); + } + + @SuppressWarnings("unchecked") + private static Map> requestHeadersField(AppSecRequestContext context) { + return (Map>) readField(context, "requestHeaders"); + } + + @SuppressWarnings("unchecked") + private static Map> responseHeadersField(AppSecRequestContext context) { + return (Map>) readField(context, "responseHeaders"); + } + + @SuppressWarnings("unchecked") + private static AtomicReference> derivativesField( + AppSecRequestContext context) { + return (AtomicReference>) readField(context, "derivatives"); + } + + /** + * Reads {@link AppSecRequestContext} private state for assertions whose invariant is about which + * instance the context still points at, rather than what its accessors report. The header getters + * null-coalesce to {@code emptyMap()} and {@code getDerivativeKeys} exposes only a key view, so + * neither can distinguish "released" from "empty". + */ + private static Object readField(AppSecRequestContext context, String fieldName) { + try { + Field field = AppSecRequestContext.class.getDeclaredField(fieldName); + field.setAccessible(true); + return field.get(context); + } catch (ReflectiveOperationException e) { + throw new AssertionError("Cannot read " + fieldName, e); + } + } +} diff --git a/dd-java-agent/benchmark-integration/gradle.lockfile b/dd-java-agent/benchmark-integration/gradle.lockfile index d94710b1e6d..67cf8c030b4 100644 --- a/dd-java-agent/benchmark-integration/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -48,7 +48,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 8b11bfe3e48..ec0bdc263e5 100644 --- a/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/jetty-perftest/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -58,7 +58,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 868389f3b8c..82c98608fb8 100644 --- a/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile +++ b/dd-java-agent/benchmark-integration/play-perftest/gradle.lockfile @@ -20,8 +20,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler,play,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -157,7 +157,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/benchmark/gradle.lockfile b/dd-java-agent/benchmark/gradle.lockfile index a96c1f95dd5..f7e41cfc384 100644 --- a/dd-java-agent/benchmark/gradle.lockfile +++ b/dd-java-agent/benchmark/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -51,7 +51,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath diff --git a/dd-java-agent/cws-tls/gradle.lockfile b/dd-java-agent/cws-tls/gradle.lockfile index c70a84176d7..fa519a852b7 100644 --- a/dd-java-agent/cws-tls/gradle.lockfile +++ b/dd-java-agent/cws-tls/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.5=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -93,7 +93,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/ddprof-lib/gradle.lockfile b/dd-java-agent/ddprof-lib/gradle.lockfile index 8a17590632b..06488014079 100644 --- a/dd-java-agent/ddprof-lib/gradle.lockfile +++ b/dd-java-agent/ddprof-lib/gradle.lockfile @@ -4,11 +4,12 @@ # 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-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:ddprof:1.50.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -54,7 +55,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/gradle.lockfile b/dd-java-agent/gradle.lockfile index b7e0bf864ba..9ad03cf9a95 100644 --- a/dd-java-agent/gradle.lockfile +++ b/dd-java-agent/gradle.lockfile @@ -9,7 +9,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=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.datadoghq.okio:okio:1.17.6=sharedShadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude -com.datadoghq:dd-instrument-java:0.0.5=shadowInclude,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=shadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.datadoghq:dd-javac-plugin-client:0.2.2=shadowInclude,testCompileClasspath,testRuntimeClasspath,traceShadowInclude com.datadoghq:java-dogstatsd-client:4.4.5=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude com.datadoghq:sketches-java:0.8.3=sharedShadowInclude,testRuntimeClasspath,traceShadowInclude @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -85,7 +85,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile index 84fc855d0ab..bfe5c6562fd 100644 --- a/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile +++ b/dd-java-agent/instrumentation-annotation-processor/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -48,7 +48,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-testing/gradle.lockfile b/dd-java-agent/instrumentation-testing/gradle.lockfile index a856839f00b..0bee7f1315a 100644 --- a/dd-java-agent/instrumentation-testing/gradle.lockfile +++ b/dd-java-agent/instrumentation-testing/gradle.lockfile @@ -23,8 +23,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=testAnnotationProcessor,testCompileClasspath com.google.auto.service:auto-service:1.1.1=testAnnotationProcessor @@ -101,7 +101,6 @@ org.junit.platform:junit-platform-runner:1.14.1=compileClasspath,runtimeClasspat org.junit.platform:junit-platform-suite-api:1.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/WithHttpServer.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/WithHttpServer.groovy index 235aa2a7933..3225b1a49b7 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/WithHttpServer.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/base/WithHttpServer.groovy @@ -33,6 +33,10 @@ abstract class WithHttpServer extends VersionedNamingTestBase { return new DefaultHttpServer() } + boolean recreateServerForEachTest() { + false + } + private class DefaultHttpServer implements HttpServer { final ServerSocket socket = PortUtils.randomOpenSocket() final int port = socket.localPort @@ -64,6 +68,30 @@ abstract class WithHttpServer extends VersionedNamingTestBase { } void setupSpec() { + if (!recreateServerForEachTest()) { + startHttpServer() + } + } + + void setup() { + if (recreateServerForEachTest()) { + startHttpServer() + } + } + + void cleanup() { + if (recreateServerForEachTest()) { + stopHttpServer() + } + } + + void cleanupSpec() { + if (!recreateServerForEachTest()) { + stopHttpServer() + } + } + + private void startHttpServer() { server = server() server.start() address = server.address() @@ -72,7 +100,7 @@ abstract class WithHttpServer extends VersionedNamingTestBase { println "$server started at: $address" } - void cleanupSpec() { + private void stopHttpServer() { server.stop() println "$server stopped at: $address" } diff --git a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy index a0c9bf9c9bc..f376a4208a2 100644 --- a/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy +++ b/dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/log/injection/LogContextInjectionTestBase.groovy @@ -2,7 +2,7 @@ package datadog.trace.agent.test.log.injection import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.CorrelationIdentifier -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.bootstrap.instrumentation.api.AgentSpan import java.util.concurrent.atomic.AtomicReference @@ -42,7 +42,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification when: put("foo", "bar") AgentSpan rootSpan = startSpan("test", "root") - AgentScope rootScope = activateSpan(rootSpan) + ContextScope rootScope = activateSpan(rootSpan) then: get(CorrelationIdentifier.getTraceIdKey()) == CorrelationIdentifier.getTraceId() @@ -51,7 +51,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification when: AgentSpan childSpan = startSpan("test", "child") - AgentScope childScope = activateSpan(childSpan) + ContextScope childScope = activateSpan(childSpan) then: get(CorrelationIdentifier.getTraceIdKey()) == CorrelationIdentifier.getTraceId() @@ -94,7 +94,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification void run() { // other trace in scope final AgentSpan thread2Span = startSpan("test", "root2") - final AgentScope thread2Scope = activateSpan(thread2Span) + final ContextScope thread2Scope = activateSpan(thread2Span) try { thread2TraceId.set(get(CorrelationIdentifier.getTraceIdKey())) } finally { @@ -105,7 +105,7 @@ abstract class LogContextInjectionTestBase extends InstrumentationSpecification } final AgentSpan mainSpan = startSpan("test", "root") - final AgentScope mainScope = activateSpan(mainSpan) + final ContextScope mainScope = activateSpan(mainSpan) thread1.start() thread2.start() final String mainThreadTraceId = get(CorrelationIdentifier.getTraceIdKey()) diff --git a/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy b/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy index 4dcdb0dd9d7..ad4e27d5558 100644 --- a/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy +++ b/dd-java-agent/instrumentation-testing/src/test/groovy/AgentTestRunnerTest.groovy @@ -5,7 +5,7 @@ import datadog.trace.agent.test.BootstrapClasspathSetupListener import datadog.trace.api.GlobalTracer import datadog.trace.api.Platform import datadog.trace.bootstrap.Constants -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 spock.lang.Shared @@ -114,7 +114,7 @@ class AgentTestRunnerTest extends InstrumentationSpecification { def "waiting for noop span returns immediately"() { when: - AgentScope scope + ContextScope scope runUnderTrace("parent") { scope = TEST_TRACER.activateManualSpan(noopSpan()) diff --git a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile index a7b2a965ab4..54074f3ad59 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/aerospike-4.0/gradle.lockfile @@ -12,7 +12,7 @@ com.aerospike:aerospike-client:8.0.0=latestDepForkedTestCompileClasspath,latestD com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest7DepForkedTestAnnotationProcessor,latest7DepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRu javax.servlet:javax.servlet-api:3.1.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -107,7 +107,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latest7DepForkedTestRuntimeClass org.junit.platform:junit-platform-suite-api:1.14.1=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latest7DepForkedTestRuntimeClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.luaj:luaj-jse:3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.luaj:luaj-jse:3.0.1=latest7DepForkedTestCompileClasspath,latest7DepForkedTestRuntimeClasspath,latest7DepTestCompileClasspath,latest7DepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mindrot:jbcrypt:0.3m=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java index 7f756381c94..c06a5c7a639 100644 --- a/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aerospike-4.0/src/main/java/datadog/trace/instrumentation/aerospike4/AerospikeClientInstrumentation.java @@ -2,14 +2,15 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.nameStartsWith; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.aerospike4.AerospikeClientDecorator.DECORATE; import static net.bytebuddy.implementation.bytecode.assign.Assigner.Typing.DYNAMIC; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -36,26 +37,26 @@ public void methodAdvice(MethodTransformer transformer) { public static final class TraceSyncRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest(@Advice.Origin("#m") final String methodName) { + public static ContextScope beginRequest(@Advice.Origin("#m") final String methodName) { AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName); return activateSpan(clientSpan); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exitRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { - DECORATE.finishAerospikeSpan(scope.span(), error); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { + DECORATE.finishAerospikeSpan(spanFromScope(scope), error); scope.close(); } } public static final class TraceAsyncRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.Origin("#m") final String methodName, @Advice.Argument(value = 1, readOnly = false, typing = DYNAMIC) Object listener) { AgentSpan clientSpan = DECORATE.startAerospikeSpan(methodName); - AgentScope scope = activateSpan(clientSpan); + ContextScope scope = activateSpan(clientSpan); // always want to wrap even when there's no listener so we get the true async time listener = new TracingListener(clientSpan, clientSpan.captureWithContext(), listener); return scope; @@ -63,9 +64,9 @@ public static AgentScope beginRequest( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exitRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { if (error != null) { - DECORATE.finishAerospikeSpan(scope.span(), error); + DECORATE.finishAerospikeSpan(spanFromScope(scope), error); } else { // span will be finished in the traced listener } 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 3060f0c5fbf..48fa73f8d3e 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 @@ -2,79 +2,79 @@ # Manual edits can break the build 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=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -cafe.cryptography:ed25519-elisabeth:0.1.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -ch.qos.logback:logback-classic:1.2.13=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc 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.jnr:jffi:1.3.15=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-posix:3.1.22=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-unixsocket:0.38.25=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-x86asm:1.0.2=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jffi:1.3.15=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.auto.service:auto-service-annotations:1.1.1=akka23ForkedTestAnnotationProcessor,akka23ForkedTestCompileClasspath,akka23TestAnnotationProcessor,akka23TestCompileClasspath,annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath -com.google.auto.service:auto-service:1.1.1=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=akka23ForkedTestAnnotationProcessor,akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestAnnotationProcessor,akka23TestCompileClasspath,akka23TestRuntimeClasspath,annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=akka23TestAnnotationProcessor,akka23TestCompileClasspath,annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=akka23TestAnnotationProcessor,akka23TestCompileClasspath,akka23TestRuntimeClasspath,annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.47.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:failureaccess:1.0.3=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:guava:32.0.1-jre=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.guava:guava:33.6.0-jre=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=akka23ForkedTestAnnotationProcessor,akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestAnnotationProcessor,akka23TestCompileClasspath,akka23TestRuntimeClasspath,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.google.j2objc:j2objc-annotations:2.8=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.j2objc:j2objc-annotations:3.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.google.re2j:re2j:1.8=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=akka23TestAnnotationProcessor,akka23TestCompileClasspath,akka23TestRuntimeClasspath,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.lmax:disruptor:3.4.2=zinc -com.squareup.moshi:moshi:1.11.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.swoval:file-tree-views:2.1.12=zinc com.thoughtworks.qdox:qdox:1.12.1=codenarc -com.typesafe.akka:akka-actor_2.11:2.3.16=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath +com.typesafe.akka:akka-actor_2.11:2.3.16=akka23TestCompileClasspath,akka23TestRuntimeClasspath com.typesafe.akka:akka-actor_2.11:2.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-actor_2.11:2.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-testkit_2.11:2.3.16=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath +com.typesafe.akka:akka-testkit_2.11:2.3.16=akka23TestCompileClasspath,akka23TestRuntimeClasspath com.typesafe.akka:akka-testkit_2.11:2.5.0=testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-testkit_2.11:2.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe:config:1.2.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath +com.typesafe:config:1.2.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath com.typesafe:config:1.3.1=compileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -commons-fileupload:commons-fileupload:1.5=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -de.thetaphi:forbiddenapis:3.10=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.15=zinc -io.leangen.geantyref:geantyref:1.3.16=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -io.sqreen:libsqreen:17.5.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:17.5.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -junit:junit:4.13.2=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +junit:junit:4.13.2=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc @@ -86,58 +86,57 @@ org.apache.logging.log4j:log4j-api:2.17.1=zinc org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apiguardian:apiguardian-api:1.1.2=akka23ForkedTestCompileClasspath,akka23TestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.33.0=akka23ForkedTestAnnotationProcessor,akka23TestAnnotationProcessor,annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=akka23TestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.33.0=akka23TestAnnotationProcessor,annotationProcessor,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=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.25=akka23TestCompileClasspath,akka23TestRuntimeClasspath,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=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.25=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs org.fusesource.jansi:jansi:2.4.1=zinc org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jctools:jctools-core-jdk11:4.0.6=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.jctools:jctools-core:4.0.6=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath 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=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-api:5.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-engine:5.14.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter-params:5.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.jupiter:junit-jupiter:5.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.10.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=akka23TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.10.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.11:0.7.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=zinc org.scala-lang.modules:scala-xml_2.13:2.3.0=zinc org.scala-lang:scala-compiler:2.13.16=zinc -org.scala-lang:scala-library:2.11.12=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.scala-lang:scala-library:2.11.12=akka23TestCompileClasspath,akka23TestRuntimeClasspath,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.scala-lang:scala-library:2.13.16=zinc org.scala-lang:scala-reflect:2.13.16=zinc org.scala-sbt.jline:jline:2.14.7-sbt-9a88bc413e2b34a4580c001c654d1a7f4f65bf18=zinc @@ -161,18 +160,18 @@ org.scala-sbt:zinc-core_2.13:1.12.0=zinc org.scala-sbt:zinc-persist-core-assembly:1.12.0=zinc org.scala-sbt:zinc-persist_2.13:1.12.0=zinc org.scala-sbt:zinc_2.13:1.12.0=zinc -org.slf4j:jcl-over-slf4j:1.7.30=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=akka23ForkedTestRuntimeClasspath,akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-junit:1.2.2=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=akka23ForkedTestCompileClasspath,akka23ForkedTestRuntimeClasspath,akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.snakeyaml:snakeyaml-engine:2.9=akka23TestRuntimeClasspath,buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=akka23TestCompileClasspath,akka23TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs empty=scalaCompilerPlugins,scalaToolchainRuntimeClasspath,spotbugsPlugins diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/groovy/AkkaActorTest.groovy b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/groovy/AkkaActorTest.groovy index e4a5d76d27a..31cb7711a6a 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/groovy/AkkaActorTest.groovy +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/akka23Test/groovy/AkkaActorTest.groovy @@ -4,7 +4,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags import spock.lang.AutoCleanup import spock.lang.Shared -class AkkaActorTest extends InstrumentationSpecification { +abstract class AbstractAkkaActorTest extends InstrumentationSpecification { @Shared @AutoCleanup def akkaTester = new AkkaActors() @@ -56,8 +56,10 @@ class AkkaActorTest extends InstrumentationSpecification { "forward" | "Akka" | "Hello" | 10 "route" | "Rakka" | "How you doin'" | 10 } +} - def "actor message handling should close leaked scopes"() { +class AkkaActorTest extends AbstractAkkaActorTest { + def "legacy actor message handling should close leaked scopes"() { when: akkaTester.leak("Leaker", "drip") @@ -86,7 +88,7 @@ class AkkaActorTest extends InstrumentationSpecification { } } -class AkkaActorContextSwapForkedTest extends AkkaActorTest { +class AkkaActorContextSwapForkedTest extends AbstractAkkaActorTest { @Override void configurePreAgent() { super.configurePreAgent() diff --git a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java index 835f8664ed1..98e6172a2df 100644 --- a/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-actor-2.5/src/main/java/datadog/trace/instrumentation/akka/init/DisableTracingActorInitInstrumentation.java @@ -6,9 +6,9 @@ import akka.actor.ActorSystem$; 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 net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -38,12 +38,12 @@ public void methodAdvice(MethodTransformer transformer) { public static class BlockPropagation { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } 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 c309622f032..5aed0a842cc 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 @@ -3,33 +3,33 @@ # 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 -ch.qos.logback:logback-classic:1.2.13=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -ch.qos.logback:logback-core:1.2.13=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.blogspot.mydailyjava:weak-lock-free:0.17=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=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.datadoghq.okio:okio:1.17.6=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.datadoghq:dd-instrument-java:0.0.4=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.eed3si9n:shaded-jawn-parser_2.13:1.3.2=zinc 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.fasterxml.jackson.core:jackson-annotations:2.10.5=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.13.4=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.8.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.8.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.10.5=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.13.4=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.8.8=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.8.8=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.10.5.1=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.13.4.2=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.8.8=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.8.8=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-guava:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.8.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath @@ -38,37 +38,37 @@ com.fasterxml.jackson.module:jackson-module-parameter-names:2.8.11=lagomTestComp com.fasterxml.jackson:jackson-bom:2.13.4=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.2.16=lagomTestCompileClasspath -com.github.jnr:jffi:1.3.15=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jffi:1.3.15=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.github.jnr:jnr-constants:0.9.9=lagomTestCompileClasspath -com.github.jnr:jnr-enxio:0.32.20=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath com.github.jnr:jnr-ffi:2.1.6=lagomTestCompileClasspath -com.github.jnr:jnr-ffi:2.2.19=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jnr-ffi:2.2.19=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 -com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor -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.auto.service:auto-service-annotations:1.1.1=annotationProcessor,baseTestAnnotationProcessor,baseTestCompileClasspath,compileClasspath,csiCompileClasspath,iastTestAnnotationProcessor,iastTestCompileClasspath,lagomTestAnnotationProcessor,lagomTestCompileClasspath,latestDepIastTestAnnotationProcessor,latestDepIastTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,version101ForkedTestAnnotationProcessor,version101ForkedTestCompileClasspath,version101IastTestAnnotationProcessor,version101IastTestCompileClasspath,version101TestAnnotationProcessor,version101TestCompileClasspath,version102IastTestAnnotationProcessor,version102IastTestCompileClasspath,version102Scala213TestAnnotationProcessor,version102Scala213TestCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,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.14.0=spotbugs -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.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.errorprone:error_prone_annotations:2.18.0=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor -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: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.guava:failureaccess:1.0.1=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.guava:failureaccess:1.0.3=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,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=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,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: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.google.j2objc:j2objc-annotations:2.8=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=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=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 @@ -86,15 +86,15 @@ com.lightbend.lagom:lagom-persistence-core_2.11:1.4.0=lagomTestCompileClasspath, com.lightbend.lagom:lagom-server_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.lightbend.lagom:lagom-spi_2.11:1.4.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.lmax:disruptor:3.4.2=zinc -com.squareup.moshi:moshi:1.11.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.squareup.okhttp3:logging-interceptor:3.12.12=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.squareup.okhttp3:okhttp:3.12.12=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.squareup.okio:okio:1.17.5=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.squareup.moshi:moshi:1.11.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +com.squareup.okio:okio:1.17.5=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.swoval:file-tree-views:2.1.12=zinc com.thoughtworks.qdox:qdox:1.12.1=codenarc -com.twitter:hpack:1.0.2=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath +com.twitter:hpack:1.0.2=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-actor_2.11:2.4.14=compileClasspath,csiCompileClasspath -com.typesafe.akka:akka-actor_2.11:2.4.19=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-actor_2.11:2.4.19=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-actor_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-actor_2.12:2.5.32=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-actor_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath @@ -106,34 +106,34 @@ com.typesafe.akka:akka-cluster-tools_2.11:2.5.9=lagomTestCompileClasspath,lagomT com.typesafe.akka:akka-cluster_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-distributed-data_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-http-core_2.11:10.0.0=compileClasspath,csiCompileClasspath -com.typesafe.akka:akka-http-core_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-http-core_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-http-core_2.11:10.0.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-http-core_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-http-core_2.12:10.2.10=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath com.typesafe.akka:akka-http-core_2.13:10.2.10=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.typesafe.akka:akka-http-core_2.13:10.5.1=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath com.typesafe.akka:akka-http-core_2.13:10.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-http-jackson_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-http-jackson_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-http-jackson_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-http-jackson_2.12:10.2.10=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath com.typesafe.akka:akka-http-jackson_2.13:10.2.10=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.typesafe.akka:akka-http-jackson_2.13:10.5.1=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath com.typesafe.akka:akka-http-jackson_2.13:10.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-http-spray-json_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-http-spray-json_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-http-spray-json_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-http-spray-json_2.13:10.2.10=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.typesafe.akka:akka-http-spray-json_2.13:10.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-http2-support_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-http2-support_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-http2-support_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-http_2.11:10.0.0=compileClasspath,csiCompileClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath -com.typesafe.akka:akka-http_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-http_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-http_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-http_2.12:10.2.10=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath com.typesafe.akka:akka-http_2.13:10.2.10=version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.typesafe.akka:akka-http_2.13:10.5.1=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath com.typesafe.akka:akka-http_2.13:10.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.akka:akka-parsing_2.11:10.0.0=compileClasspath,csiCompileClasspath -com.typesafe.akka:akka-parsing_2.11:10.0.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-parsing_2.11:10.0.10=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-parsing_2.11:10.0.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-parsing_2.12:10.1.15=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-parsing_2.12:10.2.10=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath @@ -153,7 +153,7 @@ com.typesafe.akka:akka-remote_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRunt com.typesafe.akka:akka-slf4j_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-stream-testkit_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-stream_2.11:2.4.14=compileClasspath,csiCompileClasspath -com.typesafe.akka:akka-stream_2.11:2.4.19=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe.akka:akka-stream_2.11:2.4.19=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe.akka:akka-stream_2.11:2.5.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.akka:akka-stream_2.12:2.5.32=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe.akka:akka-stream_2.12:2.6.21=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath @@ -183,27 +183,27 @@ com.typesafe.play:play_2.11:2.6.11=lagomTestCompileClasspath,lagomTestRuntimeCla com.typesafe.play:shaded-asynchttpclient:1.1.3=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.play:shaded-oauth:1.1.3=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe.play:twirl-api_2.11:1.3.12=lagomTestCompileClasspath,lagomTestRuntimeClasspath -com.typesafe:config:1.3.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe:config:1.3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe:config:1.3.2=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe:config:1.3.3=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe:config:1.4.2=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -com.typesafe:ssl-config-core_2.11:0.2.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +com.typesafe:ssl-config-core_2.11:0.2.1=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath com.typesafe:ssl-config-core_2.11:0.2.2=lagomTestCompileClasspath,lagomTestRuntimeClasspath com.typesafe:ssl-config-core_2.12:0.3.8=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath com.typesafe:ssl-config-core_2.12:0.4.3=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath com.typesafe:ssl-config-core_2.13:0.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath com.typesafe:ssl-config-core_2.13:0.6.1=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath commons-codec:commons-codec:1.10=lagomTestCompileClasspath,lagomTestRuntimeClasspath -commons-fileupload:commons-fileupload:1.5=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -commons-io:commons-io:2.11.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 +commons-fileupload:commons-fileupload:1.5=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +commons-io:commons-io:2.11.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -de.thetaphi:forbiddenapis:3.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath io.aeron:aeron-client:1.7.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.aeron:aeron-driver:1.7.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.dropwizard.metrics:metrics-core:3.2.2=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.github.java-diff-utils:java-diff-utils:4.15=zinc io.jsonwebtoken:jjwt:0.7.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath io.netty:netty-buffer:4.1.19.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.netty:netty-codec-http:4.1.19.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.netty:netty-codec:4.1.19.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath @@ -214,22 +214,22 @@ io.netty:netty-transport-native-epoll:4.1.19.Final=lagomTestCompileClasspath,lag io.netty:netty-transport-native-unix-common:4.1.19.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.netty:netty-transport:4.1.19.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath io.netty:netty:3.10.6.Final=lagomTestCompileClasspath,lagomTestRuntimeClasspath -io.spray:spray-json_2.11:1.3.3=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +io.spray:spray-json_2.11:1.3.3=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath io.spray:spray-json_2.12:1.3.6=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath io.spray:spray-json_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -io.sqreen:libsqreen:17.5.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +io.sqreen:libsqreen:17.5.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath javax.cache:cache-api:1.0.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath javax.inject:javax.inject:1=lagomTestCompileClasspath,lagomTestRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.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 +javax.servlet:javax.servlet-api:3.1.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath javax.transaction:jta:1.1=lagomTestCompileClasspath,lagomTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.9=lagomTestCompileClasspath,lagomTestRuntimeClasspath junit:junit:4.11=lagomTestCompileClasspath -junit:junit:4.13.2=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -net.java.dev.jna:jna:5.8.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +junit:junit:4.13.2=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +net.java.dev.jna:jna:5.8.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath net.jodah:typetools:0.5.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -244,79 +244,78 @@ org.apache.logging.log4j:log4j-api:2.17.1=zinc org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.17.1=zinc org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apiguardian:apiguardian-api:1.1.2=baseForkedTestCompileClasspath,baseTestCompileClasspath,iastTestCompileClasspath,lagomTestCompileClasspath,latestDepIastTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,version101ForkedTestCompileClasspath,version101IastTestCompileClasspath,version101TestCompileClasspath,version102IastTestCompileClasspath,version102Scala213TestCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,baseForkedTestAnnotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=baseTestCompileClasspath,iastTestCompileClasspath,lagomTestCompileClasspath,latestDepIastTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,version101ForkedTestCompileClasspath,version101IastTestCompileClasspath,version101TestCompileClasspath,version102IastTestCompileClasspath,version102Scala213TestCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,lagomTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version101ForkedTestAnnotationProcessor,version101IastTestAnnotationProcessor,version101TestAnnotationProcessor,version102IastTestAnnotationProcessor,version102Scala213TestAnnotationProcessor 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=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.groovy:groovy-json:3.0.25=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath 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.groovy:groovy:3.0.25=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath 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 +org.eclipse.jetty.alpn:alpn-api:1.1.3.v20160715=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath org.fusesource.jansi:jansi:2.4.1=zinc org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.hamcrest:hamcrest:3.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.hamcrest:hamcrest-core:1.3=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.hamcrest:hamcrest:3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.javassist:javassist:3.21.0-GA=lagomTestCompileClasspath,lagomTestRuntimeClasspath -org.jctools:jctools-core-jdk11:4.0.6=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.jctools:jctools-core:4.0.6=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.jctools:jctools-core:4.0.6=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath 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.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 -org.junit.jupiter:junit-jupiter: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.platform:junit-platform-commons:1.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.platform:junit-platform-engine:1.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.platform:junit-platform-launcher:1.14.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.junit:junit-bom: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:junit-bom:6.1.2=spotbugs +org.jspecify:jspecify:1.0.0=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=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=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=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:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.junit:junit-bom:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.lmdbjava:lmdbjava:0.6.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath -org.mockito:mockito-core:4.4.0=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.objenesis:objenesis:3.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 -org.opentest4j:opentest4j:1.3.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.mockito:mockito-core:4.4.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.objenesis:objenesis:3.3=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.ow2.asm:asm-analysis:5.0.3=lagomTestCompileClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath org.ow2.asm:asm-commons:5.0.3=lagomTestCompileClasspath -org.ow2.asm:asm-commons:9.10.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath org.ow2.asm:asm-tree:5.0.3=lagomTestCompileClasspath -org.ow2.asm:asm-tree:9.10.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath org.ow2.asm:asm-util:5.0.3=lagomTestCompileClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.ow2.asm:asm:9.10.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.ow2.asm:asm:9.10.1=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.pcollections:pcollections:2.1.2=lagomTestCompileClasspath,lagomTestRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath org.reactivestreams:reactive-streams:1.0.2=lagomTestCompileClasspath,lagomTestRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath org.reactivestreams:reactive-streams:1.0.3=version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.reactivestreams:reactive-streams:1.0.4=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.reflections:reflections:0.9.11=lagomTestCompileClasspath,lagomTestRuntimeClasspath -org.scala-lang.modules:scala-java8-compat_2.11:0.7.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +org.scala-lang.modules:scala-java8-compat_2.11:0.7.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.11:0.8.0=lagomTestCompileClasspath,lagomTestRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.12:0.8.0=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath org.scala-lang.modules:scala-java8-compat_2.13:1.0.0=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.scala-lang.modules:scala-parallel-collections_2.13:0.2.0=zinc -org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath +org.scala-lang.modules:scala-parser-combinators_2.11:1.0.4=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath org.scala-lang.modules:scala-parser-combinators_2.11:1.0.6=lagomTestCompileClasspath,lagomTestRuntimeClasspath org.scala-lang.modules:scala-parser-combinators_2.12:1.1.2=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath org.scala-lang.modules:scala-parser-combinators_2.13:1.1.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath,zinc org.scala-lang.modules:scala-xml_2.11:1.0.6=lagomTestCompileClasspath,lagomTestRuntimeClasspath org.scala-lang.modules:scala-xml_2.13:2.3.0=zinc org.scala-lang:scala-compiler:2.13.16=zinc -org.scala-lang:scala-library:2.11.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath +org.scala-lang:scala-library:2.11.12=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath org.scala-lang:scala-library:2.12.18=version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath org.scala-lang:scala-library:2.13.11=latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.scala-lang:scala-library:2.13.16=zinc @@ -343,19 +342,19 @@ org.scala-sbt:zinc-core_2.13:1.12.0=zinc org.scala-sbt:zinc-persist-core-assembly:1.12.0=zinc org.scala-sbt:zinc-persist_2.13:1.12.0=zinc org.scala-sbt:zinc_2.13:1.12.0=zinc -org.slf4j:jcl-over-slf4j:1.7.30=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.slf4j:jul-to-slf4j:1.7.30=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.slf4j:log4j-over-slf4j:1.7.30=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.slf4j:jcl-over-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=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.slf4j:slf4j-api:1.7.32=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=baseForkedTestRuntimeClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.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.spockframework:spock-core:2.4-groovy-3.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.tabletest:tabletest-junit:1.2.2=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.tabletest:tabletest-parser:1.2.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.snakeyaml:snakeyaml-engine:2.9=baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,iastTestRuntimeClasspath,lagomTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,version101ForkedTestRuntimeClasspath,version101IastTestRuntimeClasspath,version101TestRuntimeClasspath,version102IastTestRuntimeClasspath,version102Scala213TestRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,lagomTestCompileClasspath,lagomTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version101ForkedTestCompileClasspath,version101ForkedTestRuntimeClasspath,version101IastTestCompileClasspath,version101IastTestRuntimeClasspath,version101TestCompileClasspath,version101TestRuntimeClasspath,version102IastTestCompileClasspath,version102IastTestRuntimeClasspath,version102Scala213TestCompileClasspath,version102Scala213TestRuntimeClasspath org.typelevel:macro-compat_2.11:1.1.1=lagomTestCompileClasspath,lagomTestRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs empty=csiAnnotationProcessor,csiRuntimeClasspath,scalaCompilerPlugins,scalaToolchainRuntimeClasspath,spotbugsPlugins,testArtifacts diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy index a1aa9510a93..2d807d5e215 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/groovy/AkkaHttpServerInstrumentationTest.groovy @@ -1,6 +1,7 @@ import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions +import datadog.trace.api.config.TraceInstrumentationConfig import datadog.trace.test.util.ThreadUtils import datadog.trace.instrumentation.akkahttp.AkkaHttpServerDecorator import okhttp3.HttpUrl @@ -319,6 +320,20 @@ class AkkaHttpServerInstrumentationBindAndHandleTest extends AkkaHttpServerInstr } } +class AkkaHttpServerInstrumentationBindAndHandleContextSwapForkedTest extends AkkaHttpServerInstrumentationBindAndHandleTest { + @Override + boolean recreateServerForEachTest() { + // This forked suite changes a process-wide setting; do not let its actor system outlive it. + true + } + + @Override + void configurePreAgent() { + super.configurePreAgent() + injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false") + } +} + class AkkaHttpServerInstrumentationBindAndHandleAsyncWithRouteAsyncHandlerTest extends AkkaHttpServerInstrumentationTest { String akkaHttpVersion diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java new file mode 100644 index 00000000000..a439fdd92ce --- /dev/null +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/java/datadog/trace/instrumentation/akkahttp/SwappedContextScopeTest.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.akkahttp; + +import static org.junit.jupiter.api.Assertions.assertSame; + +import datadog.context.Context; +import datadog.context.ContextKey; +import datadog.context.ContextScope; +import org.junit.jupiter.api.Test; + +class SwappedContextScopeTest { + private static final ContextKey KEY = ContextKey.named("akka-http-swap-test"); + + @Test + void restoresPreviousContext() { + Context previous = Context.root().with(KEY, "previous"); + Context request = Context.root().with(KEY, "request"); + + try (ContextScope previousScope = previous.attach()) { + try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) { + assertSame(request, Context.current()); + } + assertSame(previous, Context.current()); + } + } + + @Test + void waitsUntilRequestContextIsCurrent() { + Context previous = Context.root().with(KEY, "previous"); + Context request = Context.root().with(KEY, "request"); + Context other = Context.root().with(KEY, "other"); + + try (ContextScope previousScope = previous.attach()) { + ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request); + try (ContextScope otherScope = other.attach()) { + requestScope.close(); + assertSame(other, Context.current()); + } + assertSame(request, Context.current()); + requestScope.close(); + assertSame(previous, Context.current()); + } + } +} diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/scala/AkkaHttpTestWebServer.scala b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/scala/AkkaHttpTestWebServer.scala index 4c6d5b3f142..8fce57838e2 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/scala/AkkaHttpTestWebServer.scala +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/baseTest/scala/AkkaHttpTestWebServer.scala @@ -58,9 +58,12 @@ class AkkaHttpTestWebServer(binder: Binder) extends HttpServer { override def stop(): Unit = { import materializer.executionContext - portBinding - .flatMap(_.unbind()) - .onComplete(_ => system.terminate()) + Await.ready( + portBinding + .flatMap(_.unbind()) + .flatMap(_ => system.terminate()), + 10 seconds + ) } override def address(): URI = { diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java index 169cb3dbbc0..846a9c6b836 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttp2ServerInstrumentation.java @@ -36,6 +36,7 @@ public String[] knownMatchingTypes() { public String[] helperClassNames() { return new String[] { packageName + ".DatadogWrapperHelper", + packageName + ".DatadogWrapperHelper$SwappedContextScope", packageName + ".DatadogAsyncHandlerWrapper", packageName + ".DatadogAsyncHandlerWrapper$1", packageName + ".DatadogAsyncHandlerWrapper$2", diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java index 0f2649fbc3a..02d3d90a05c 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpServerInstrumentation.java @@ -65,6 +65,7 @@ public String instrumentedType() { public String[] helperClassNames() { return new String[] { packageName + ".DatadogWrapperHelper", + packageName + ".DatadogWrapperHelper$SwappedContextScope", packageName + ".DatadogServerRequestResponseFlowWrapper", packageName + ".DatadogServerRequestResponseFlowWrapper$1", packageName + ".DatadogServerRequestResponseFlowWrapper$1$1", diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java index 56e14e2c513..5fe7844e488 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaHttpSingleRequestInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST; import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.AKKA_HTTP_CLIENT; import static datadog.trace.instrumentation.akkahttp.AkkaHttpClientDecorator.DECORATE; @@ -16,10 +17,10 @@ import akka.http.scaladsl.model.HttpRequest; import akka.http.scaladsl.model.HttpResponse; 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.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import scala.concurrent.Future; @@ -66,7 +67,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class SingleRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) { + public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) { /* Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here we cast 'wider net' and avoid instrumenting twice. @@ -88,13 +89,13 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque public static void methodExit( @Advice.This final HttpExt thiz, @Advice.Return final Future responseFuture, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable == null) { responseFuture.onComplete(new OnCompleteHandler(span), thiz.system().dispatcher()); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java index 83e7a74a3e2..ce271b32e64 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/AkkaPoolMasterActorInstrumentation.java @@ -5,9 +5,9 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; 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 net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -39,12 +39,12 @@ public void methodAdvice(MethodTransformer transformer) { public static class BlockPropagation { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java index e35593c27e0..545aeff7600 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogServerRequestResponseFlowWrapper.java @@ -67,7 +67,7 @@ public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws @Override public void onPush() throws Exception { final HttpRequest request = grab(requestInlet); - final ContextScope scope = DatadogWrapperHelper.createSpan(request); + final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request); final AgentSpan span = fromContext(scope.context()); RequestContext requestContext = span.getRequestContext(); if (requestContext != null) { @@ -87,11 +87,8 @@ public void onPush() throws Exception { scopes.add(scope); push(requestOutlet, request); - // Since we haven't instrumented the akka stream state machine, we can't rely - // on spans and scopes being propagated during the push and pull of the - // element. Instead we let the scope leak intentionally here and clean it - // up when the user response comes back, or in the actor message processing - // instrumentation that drives this state machine. + // Legacy mode leaves the scope open so the surrounding actor can clean it up. + // Context-manager mode swaps the context and the actor restores it on exit. } @Override @@ -143,9 +140,7 @@ public void onPush() throws Exception { response = newResponse; } DatadogWrapperHelper.finishSpan(scope.context(), response); - // Check if the active span matches the scope from when the request came in, - // and close it. If it's not, then it will be cleaned up actor message - // processing instrumentation that drives this state machine + // Legacy mode may still own the scope when the response arrives. AgentSpan activeSpan = activeSpan(); if (activeSpan == span) { scope.close(); diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java index 2acf49c3ad6..cf0a5d68258 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.0/src/main/java/datadog/trace/instrumentation/akkahttp/DatadogWrapperHelper.java @@ -7,17 +7,59 @@ import akka.http.scaladsl.model.HttpResponse; import datadog.context.Context; import datadog.context.ContextScope; +import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class DatadogWrapperHelper { + private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED = + InstrumenterConfig.get().isLegacyContextManagerEnabled(); + public static ContextScope createSpan(final HttpRequest request) { + return startSpan(request).attach(); + } + + public static ContextScope createSpanForFlow(final HttpRequest request) { + final Context context = startSpan(request); + if (LEGACY_CONTEXT_MANAGER_ENABLED) { + return context.attach(); + } + return new SwappedContextScope(context); + } + + private static Context startSpan(final HttpRequest request) { final Context parentContext = DECORATE.extract(request); final Context context = DECORATE.startSpan(request, parentContext); final AgentSpan span = fromContext(context); DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, parentContext); - return context.attach(); + return context; + } + + static final class SwappedContextScope implements ContextScope { + private final Context context; + private final Context previousContext; + private final Thread ownerThread; + private boolean closed; + + SwappedContextScope(final Context context) { + this.context = context; + this.ownerThread = Thread.currentThread(); + this.previousContext = context.swap(); + } + + @Override + public Context context() { + return context; + } + + @Override + public void close() { + if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) { + closed = true; + previousContext.swap(); + } + } } public static void finishSpan(final Context context, final HttpResponse response) { 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 a23fa20fe92..1fa26c91245 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -65,8 +65,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -115,7 +115,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 8a47b8a77f4..d43fd5e4f6a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -34,8 +34,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,7 +61,7 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.swoval:file-tree-views:2.1.12=zinc com.thoughtworks.qdox:qdox:1.12.1=codenarc -com.typesafe.akka:akka-actor_2.13:2.10.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.akka:akka-actor_2.13:2.10.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.akka:akka-actor_2.13:2.9.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-http-core_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-http-core_2.13:10.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -73,10 +73,10 @@ com.typesafe.akka:akka-http_2.13:10.6.0=main_java11CompileClasspath,testCompileC com.typesafe.akka:akka-http_2.13:10.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.akka:akka-parsing_2.13:10.6.0=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe.akka:akka-parsing_2.13:10.7.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-pki_2.13:2.10.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.typesafe.akka:akka-protobuf-v3_2.13:2.10.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.akka:akka-pki_2.13:2.10.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.akka:akka-protobuf-v3_2.13:2.10.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.akka:akka-protobuf-v3_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath -com.typesafe.akka:akka-stream_2.13:2.10.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.typesafe.akka:akka-stream_2.13:2.10.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.typesafe.akka:akka-stream_2.13:2.9.0=testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.3=main_java11CompileClasspath,testCompileClasspath,testRuntimeClasspath com.typesafe:config:1.4.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -91,8 +91,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.openhft:zero-allocation-hashing:0.16=zinc @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java index de14a16d057..f35f13707a6 100644 --- a/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java +++ b/dd-java-agent/instrumentation/akka/akka-http/akka-http-10.6/src/main/java11/datadog/trace/instrumentation/akkahttp106/SingleRequestAdvice.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.AKKA_CLIENT_REQUEST; import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.AKKA_HTTP_CLIENT; import static datadog.trace.instrumentation.akkahttp106.AkkaHttpClientDecorator.DECORATE; @@ -9,14 +10,14 @@ import akka.http.scaladsl.HttpExt; import akka.http.scaladsl.model.HttpRequest; import akka.http.scaladsl.model.HttpResponse; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import scala.concurrent.Future; public class SingleRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) { + public static ContextScope methodEnter(@Advice.Argument(value = 0) final HttpRequest request) { final AkkaHttpClientHelpers.AkkaHttpHeaders headers = new AkkaHttpClientHelpers.AkkaHttpHeaders(request); if (headers.hadSpan()) { @@ -33,13 +34,13 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque public static void methodExit( @Advice.This final HttpExt thiz, @Advice.Return final Future responseFuture, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable == null) { responseFuture.onComplete( 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 e570558d420..ef7aa222bf0 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 d104e659f3f..423c2d59a7f 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=iastIntegrationTestCompileClasspath,iastInteg com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,iastIntegrationTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v41IastIntegrationTestAnnotationProcessor,v42IastIntegrationTestAnnotationProcessor,v43IastIntegrationTestAnnotationProcessor,v44IastIntegrationTestAnnotationProcessor,v45IastIntegrationTestAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=iastIntegrationTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath net.java.dev.jna:jna:5.8.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -126,7 +126,6 @@ org.junit.platform:junit-platform-runner:1.14.1=iastIntegrationTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath org.junit:junit-bom:5.14.1=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=iastIntegrationTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestRuntimeClasspath org.objenesis:objenesis:3.3=iastIntegrationTestCompileClasspath,iastIntegrationTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v41IastIntegrationTestCompileClasspath,v41IastIntegrationTestRuntimeClasspath,v42IastIntegrationTestCompileClasspath,v42IastIntegrationTestRuntimeClasspath,v43IastIntegrationTestCompileClasspath,v43IastIntegrationTestRuntimeClasspath,v44IastIntegrationTestCompileClasspath,v44IastIntegrationTestRuntimeClasspath,v45IastIntegrationTestCompileClasspath,v45IastIntegrationTestRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java index 4f70c43a034..aea16047e36 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/ApacheHttpClientInstrumentation.java @@ -3,16 +3,17 @@ import static datadog.trace.agent.tooling.InstrumenterModule.TargetSystem.CONTEXT_TRACKING; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isMethod; 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.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.implementation.bytecode.assign.Assigner; @@ -163,7 +164,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class UriRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) { + public static ContextScope methodEnter(@Advice.Argument(0) final HttpUriRequest request) { try { return HelperMethods.doMethodEnter(request); } catch (BlockingException e) { @@ -175,7 +176,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final HttpUriRequest re @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); @@ -185,7 +186,7 @@ public static void methodExit( public static class UriRequestWithHandlerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final HttpUriRequest request, @Advice.Argument( value = 1, @@ -195,11 +196,12 @@ public static AgentScope methodEnter( Object handler) { try { - final AgentScope scope = HelperMethods.doMethodEnter(request); + final ContextScope scope = HelperMethods.doMethodEnter(request); // Wrap the handler so we capture the status code if (null != scope && handler instanceof ResponseHandler) { handler = - new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + new WrappingStatusSettingResponseHandler( + spanFromScope(scope), (ResponseHandler) handler); } return scope; } catch (BlockingException e) { @@ -211,7 +213,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); @@ -220,7 +222,7 @@ public static void methodExit( public static class RequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request) { try { if (request instanceof HttpUriRequest) { @@ -237,7 +239,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); @@ -247,7 +249,7 @@ public static void methodExit( public static class RequestWithHandlerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final HttpRequest request, @Advice.Argument( @@ -257,7 +259,7 @@ public static AgentScope methodEnter( readOnly = false) Object handler) { try { - final AgentScope scope; + final ContextScope scope; if (request instanceof HttpUriRequest) { scope = HelperMethods.doMethodEnter((HttpUriRequest) request); } else { @@ -266,7 +268,8 @@ public static AgentScope methodEnter( // Wrap the handler so we capture the status code if (null != scope && handler instanceof ResponseHandler) { handler = - new WrappingStatusSettingResponseHandler(scope.span(), (ResponseHandler) handler); + new WrappingStatusSettingResponseHandler( + spanFromScope(scope), (ResponseHandler) handler); } return scope; } catch (BlockingException e) { @@ -278,7 +281,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java index a1bc6397dda..b4f77d405c6 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-4.0/src/main/java/datadog/trace/instrumentation/apachehttpclient/HelperMethods.java @@ -3,13 +3,14 @@ import static datadog.context.Context.current; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient.ApacheHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.apachehttpclient.HttpHeadersInjectAdapter.SETTER; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.apache.http.HttpHost; import org.apache.http.HttpRequest; @@ -18,7 +19,7 @@ import org.apache.http.client.methods.HttpUriRequest; public class HelperMethods { - public static AgentScope doMethodEnter(final HttpUriRequest request) { + public static ContextScope doMethodEnter(final HttpUriRequest request) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); if (callDepth > 0) { return null; @@ -26,7 +27,7 @@ public static AgentScope doMethodEnter(final HttpUriRequest request) { return activateHttpSpan(request); } - public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { + public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); if (callDepth > 0) { return null; @@ -35,9 +36,9 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request)); } - private static AgentScope activateHttpSpan(final HttpUriRequest request) { + private static ContextScope activateHttpSpan(final HttpUriRequest request) { final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onRequest(span, request); @@ -63,11 +64,11 @@ public static void doInjectContext(final HttpHost host, final HttpRequest reques } public static void doMethodExit( - final AgentScope scope, final Object result, final Throwable throwable) { + final ContextScope scope, final Object result, final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (result instanceof HttpResponse) { DECORATE.onResponse(span, (HttpResponse) result); } // else they probably provided a ResponseHandler. 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 db00545c90c..af17a1a0218 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java index d889cd17465..5803ecab414 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpAsyncClientInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.HTTP_REQUEST; @@ -15,10 +16,10 @@ import com.google.auto.service.AutoService; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import net.bytebuddy.asm.Advice; @@ -109,14 +110,14 @@ public static void onEnter( public static class ClientAdvice { @SuppressFBWarnings("UC_USELESS_OBJECT") @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(value = 0, readOnly = false) AsyncRequestProducer requestProducer, @Advice.Argument(value = 3, readOnly = false) HttpContext context, @Advice.Argument(value = 4, readOnly = false) FutureCallback futureCallback) { final ContextContinuation parentContinuation = currentContext().capture(); final AgentSpan clientSpan = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); - final AgentScope clientScope = activateSpan(clientSpan); + final ContextScope clientScope = activateSpan(clientSpan); DECORATE.afterStart(clientSpan); if (context == null) { @@ -137,13 +138,13 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java index d1e1d2752a7..9d044b58f32 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/ApacheHttpClientInstrumentation.java @@ -3,16 +3,17 @@ import static datadog.trace.agent.tooling.InstrumenterModule.TargetSystem.CONTEXT_TRACKING; import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isMethod; 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.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.implementation.bytecode.assign.Assigner; @@ -122,7 +123,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) { + public static ContextScope methodEnter(@Advice.Argument(0) final ClassicHttpRequest request) { try { return HelperMethods.doMethodEnter(request); } catch (BlockingException e) { @@ -134,7 +135,7 @@ public static AgentScope methodEnter(@Advice.Argument(0) final ClassicHttpReques @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); @@ -143,7 +144,7 @@ public static void methodExit( public static class HostRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final ClassicHttpRequest request) { try { @@ -157,7 +158,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); @@ -167,7 +168,7 @@ public static void methodExit( public static class ResponseHandlerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final HttpHost host, @Advice.Argument(1) final ClassicHttpRequest request, @Advice.Argument(2) final HttpContext context, @@ -178,12 +179,12 @@ public static AgentScope methodEnter( readOnly = false) Object handler) { try { - final AgentScope scope = HelperMethods.doMethodEnter(host, request); + final ContextScope scope = HelperMethods.doMethodEnter(host, request); // Wrap the handler so we capture the status code if (null != scope && handler instanceof HttpClientResponseHandler) { handler = new WrappingStatusSettingResponseHandler( - scope.span(), (HttpClientResponseHandler) handler); + spanFromScope(scope), (HttpClientResponseHandler) handler); } return scope; } catch (BlockingException e) { @@ -195,7 +196,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final Object result, @Advice.Thrown final Throwable throwable) { HelperMethods.doMethodExit(scope, result, throwable); diff --git a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java index 2e93067ea35..c4d5b6a2ac6 100644 --- a/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java +++ b/dd-java-agent/instrumentation/apache-httpclient/apache-httpclient-5.0/src/main/java/datadog/trace/instrumentation/apachehttpclient5/HelperMethods.java @@ -3,13 +3,14 @@ import static datadog.context.Context.current; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.APACHE_HTTP_CLIENT; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.apachehttpclient5.ApacheHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.apachehttpclient5.HttpHeadersInjectAdapter.SETTER; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.apache.hc.client5.http.classic.HttpClient; import org.apache.hc.core5.http.HttpHost; @@ -17,7 +18,7 @@ import org.apache.hc.core5.http.HttpResponse; public class HelperMethods { - public static AgentScope doMethodEnter(final HttpRequest request) { + public static ContextScope doMethodEnter(final HttpRequest request) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); if (callDepth > 0) { return null; @@ -26,7 +27,7 @@ public static AgentScope doMethodEnter(final HttpRequest request) { return activateHttpSpan(request); } - public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { + public static ContextScope doMethodEnter(HttpHost host, HttpRequest request) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); if (callDepth > 0) { return null; @@ -35,9 +36,9 @@ public static AgentScope doMethodEnter(HttpHost host, HttpRequest request) { return activateHttpSpan(new HostAndRequestAsHttpUriRequest(host, request)); } - private static AgentScope activateHttpSpan(final HttpRequest request) { + private static ContextScope activateHttpSpan(final HttpRequest request) { final AgentSpan span = startSpan(APACHE_HTTP_CLIENT.toString(), HTTP_REQUEST); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onRequest(span, request); @@ -53,11 +54,11 @@ public static void doInjectContext(final HttpRequest request) { } public static void doMethodExit( - final AgentScope scope, final Object result, final Throwable throwable) { + final ContextScope scope, final Object result, final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (result instanceof HttpResponse) { DECORATE.onResponse(span, (HttpResponse) result); } // else they probably provided a ResponseHandler. 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 9c479e4af5a..2ed1e8e81ec 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0dbcfcece65..646f1c51162 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 19542ed28f1..5954fe3634e 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 @@ -11,7 +11,7 @@ com.aayushatharva.brotli4j:service:1.23.0=latestDepForkedTestCompileProtoPath,la com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath 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 @@ -36,8 +36,8 @@ 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.10.3=compileClasspath,compileProtoPath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.api.grpc:proto-google-common-protos:1.12.0=compileClasspath,compileProtoPath @@ -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.41.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc-protocol:1.41.1=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.41.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-grpc:1.41.1=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.41.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-protobuf:1.41.1=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.41.0=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.41.1=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 @@ -185,8 +185,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath junit:junit:4.13.2=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -236,7 +236,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestCompileProtoP org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestCompileProtoPath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs 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 diff --git a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java index 189e6aa47b2..17450cc5235 100644 --- a/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java +++ b/dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/src/main/java/datadog/trace/instrumentation/armeria/grpc/client/ArmeriaMessageDeframerInstrumentation.java @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.linecorp.armeria.common.grpc.protocol.ArmeriaMessageDeframer; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.grpc.ClientCall; import net.bytebuddy.asm.Advice; @@ -80,7 +80,7 @@ public static void capture( public static final class ActivateSpan { @SuppressWarnings("rawtypes") @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ArmeriaMessageDeframer messageDeframer) { + public static ContextScope before(@Advice.This ArmeriaMessageDeframer messageDeframer) { ClientCall clientCall = InstrumentationContext.get(ArmeriaMessageDeframer.class, ClientCall.class) .get(messageDeframer); @@ -95,7 +95,7 @@ public static AgentScope before(@Advice.This ArmeriaMessageDeframer messageDefra } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } 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 58c84f37af1..0c436799290 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 @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.armeria.grpc.client.GrpcClientDecorator.GRPC_MESSAGE; @@ -16,11 +17,11 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.grpc.ClientCall; import io.grpc.Metadata; @@ -102,7 +103,7 @@ public static void capture( public static final class Start { @Advice.OnMethodEnter - public static AgentScope before( + public static ContextScope before( @Advice.This ClientCall call, @Advice.Argument(0) ClientCall.Listener responseListener, @Advice.Argument(1) Metadata headers, @@ -118,7 +119,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class) public static void after( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Thrown Throwable error, @Advice.Local("$$ddSpan") AgentSpan span) throws Throwable { @@ -146,7 +147,7 @@ public static void before(@Advice.Argument(1) Metadata headers) { public static final class ActivateSpan { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); if (null != span) { return activateSpan(span); @@ -155,7 +156,7 @@ public static AgentScope before(@Advice.This ClientCall call) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } @@ -164,7 +165,7 @@ public static void after(@Advice.Enter AgentScope scope) { public static final class SendMessage { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { // could create a message span here for the request AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); if (span != null) { @@ -174,7 +175,7 @@ public static AgentScope before(@Advice.This ClientCall call) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } @@ -199,7 +200,7 @@ public static void before( public static final class CloseObserver { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).remove(call); if (span != null) { return activateSpan(span); @@ -209,11 +210,12 @@ public static AgentScope before(@Advice.This ClientCall call) { @Advice.OnMethodExit(onThrowable = Throwable.class) public static void closeObserver( - @Advice.Enter AgentScope scope, @Advice.Argument(0) Status status) { + @Advice.Enter ContextScope scope, @Advice.Argument(0) Status status) { if (null != scope) { - DECORATE.onClose(scope.span(), status); + AgentSpan span = spanFromScope(scope); + DECORATE.onClose(span, status); scope.close(); - scope.span().finish(); + span.finish(); } } } @@ -225,7 +227,7 @@ public static void closeObserver( */ public static final class CloseObserverWithCause { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); if (span != null) { return activateSpan(span); @@ -236,7 +238,7 @@ public static AgentScope before(@Advice.This ClientCall call) { @Advice.OnMethodExit(onThrowable = Throwable.class) public static void closeObserver( @Advice.This ClientCall call, - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Argument(0) Status status, @Advice.FieldValue("closed") boolean closed) { if (null != scope) { @@ -257,7 +259,7 @@ public static void closeObserver( public static final class ReceiveMessages { @Advice.OnMethodEnter - public static AgentScope before() { + public static ContextScope before() { AgentSpan clientSpan = activeSpan(); if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) { AgentSpan messageSpan = @@ -270,10 +272,10 @@ public static AgentScope before() { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 fb99cc6963f..9a954805f92 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 @@ -13,7 +13,7 @@ com.aayushatharva.brotli4j:service:1.23.0=jetty11LatestDepTestRuntimeClasspath,j com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,jetty11LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,jetty9LatestDepTestAnnotationProcessor,jetty9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,11 +58,11 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,jetty11LatestDepTes 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.41.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty11:1.41.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria-jetty9:1.24.0=compileClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria-jetty9:1.41.0=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria-jetty9:1.41.1=jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath com.linecorp.armeria:armeria:1.24.0=compileClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath -com.linecorp.armeria:armeria:1.41.0=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath +com.linecorp.armeria:armeria:1.41.1=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 @@ -131,8 +131,8 @@ javax.servlet:javax.servlet-api:3.1.0=compileClasspath,jetty11LatestDepTestCompi javax.websocket:javax.websocket-api:1.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -202,7 +202,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jetty11LatestDepTestRuntimeClass org.junit.platform:junit-platform-suite-api:1.14.1=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jetty11LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jetty11LatestDepTestCompileClasspath,jetty11LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,jetty9LatestDepTestCompileClasspath,jetty9LatestDepTestRuntimeClasspath,jetty9TestCompileClasspath,jetty9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 2cda8aa48db..f122c7f9457 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 9019991e9f9..98701c01fc0 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,31 +58,31 @@ commons-logging:commons-logging:1.2=testRuntimeClasspath 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.1.118.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.118.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.118.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.118.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.118.Final=testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.118.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.118.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.118.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.118.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.118.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -160,57 +159,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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:dynamodb:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:dynamodb:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:dynamodb:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.30.22=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.30.22=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.55.0=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 80f265ffc0d..cecf2e5a428 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,31 +58,31 @@ commons-logging:commons-logging:1.2=latestDepForkedTestRuntimeClasspath,latestDe 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.1.112.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.112.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.112.Final=testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.112.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.112.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.112.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -161,83 +160,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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.27.23=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.27.19=compileClasspath software.amazon.awssdk:auth:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.27.23=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.27.19=compileClasspath software.amazon.awssdk:profiles:2.27.23=testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.55.0=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 154b598b2b4..ef1bfb324f7 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 @@ -10,7 +10,7 @@ com.amazonaws:aws-lambda-java-core:1.2.1=compileClasspath,latestDepTestCompileCl 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java index cb8d369d51e..79158d9228a 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/main/java/datadog/trace/instrumentation/aws/v1/lambda/LambdaHandlerInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.aws.v1.lambda.LambdaHandlerDecorator.INVOCATION_SPAN_NAME; import static net.bytebuddy.asm.Advice.Enter; import static net.bytebuddy.asm.Advice.OnMethodEnter; @@ -16,10 +17,10 @@ import com.amazonaws.services.lambda.runtime.Context; import com.amazonaws.services.lambda.runtime.RequestHandler; 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.CallDepthThreadLocalMap; -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; @@ -80,7 +81,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ExtensionCommunicationAdvice { @OnMethodEnter - static AgentScope enter( + static ContextScope enter( @This final Object that, @Advice.Argument(0) final Object in, @Advice.Argument(1) final Object out, @@ -101,14 +102,14 @@ static AgentScope enter( span.setSpanType(InternalSpanTypes.SERVERLESS); span.setTag("request_id", lambdaRequestId); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); return scope; } @OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) static void exit( @Origin String method, - @Enter final AgentScope scope, + @Enter final ContextScope scope, @Advice.Argument(1) final Object result, @Advice.Argument(2) final Context awsContext, @Advice.Thrown final Throwable throwable) { @@ -119,7 +120,7 @@ static void exit( CallDepthThreadLocalMap.reset(RequestHandler.class); - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); try { if (throwable == null) { AgentTracer.get().notifyAppSecEnd(span, result); diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java index 614aa40c0ff..a25e2f8fb4f 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/src/test/java/LambdaHandlerInstrumentationTest.java @@ -366,10 +366,11 @@ void responseCallbacksReceiveCorrectDataFor404Response() throws IOException { } @Test - void responseCallbacksApplyFallbackForLambdaUrlWithNonApiGatewayResponse() throws IOException { - // A Lambda Function URL handler returning plain JSON (no statusCode/headers/body structure) - // should trigger the fallback: no responseStarted (status unknown), content-type: - // application/json, full JSON as body. + void responseCallbacksTreatLambdaUrlResponseWithoutStatusCodeAsImplicitSuccess() + throws IOException { + // A Lambda Function URL return value carrying no statusCode is not a response the gateway + // honours: it serialises the whole value as the body of a 200 with content-type + // application/json, which is what the callbacks must report. String eventJson = "{" + "\"version\": \"2.0\"," @@ -389,7 +390,7 @@ void responseCallbacksApplyFallbackForLambdaUrlWithNonApiGatewayResponse() throw ByteArrayOutputStream output = new ByteArrayOutputStream(); new HandlerStreamingWithRawJson().handleRequest(input, output, newContext()); - assertNull(capturedResponseStatus); // no responseStarted for status-less fallback + assertEquals(200, (int) capturedResponseStatus); assertEquals("application/json", capturedResponseHeaders.get("content-type")); assertTrue(capturedResponseBody instanceof Map); assertEquals("hello", ((Map) capturedResponseBody).get("result")); 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 8b12b885ba5..38ecd62d04e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,31 +58,31 @@ commons-logging:commons-logging:1.2=testRuntimeClasspath 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.1.115.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.115.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.115.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.115.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.115.Final=testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.115.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.115.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.115.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.115.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.115.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -160,63 +159,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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:arns:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:arns:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:arns:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-query-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-query-protocol:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-xml-protocol:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-xml-protocol:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-xml-protocol:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:crt-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:crt-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:crt-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.29.26=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries-spi:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:retries:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:retries:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:s3:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:s3:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:s3:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.29.26=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.55.0=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 c9f3b010e51..5fde054b479 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 @@ -2,187 +2,186 @@ # Manual edits can break the build 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 -ch.qos.logback:logback-core: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 -com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +ch.qos.logback:logback-core:1.2.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.11.0=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-core:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-core:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-core:1.12.366=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-core:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-dynamodb:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.amazonaws:aws-java-sdk-dynamodb:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-dynamodb:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-dynamodb:1.11.106=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-dynamodb:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.amazonaws:aws-java-sdk-ec2:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.amazonaws:aws-java-sdk-ec2:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-ec2:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-ec2:1.11.106=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-ec2:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.amazonaws:aws-java-sdk-kinesis:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-kinesis:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-kinesis:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-kinesis:1.12.366=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-kinesis:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-kms:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.amazonaws:aws-java-sdk-kms:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-kms:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-kms:1.11.106=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-kms:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.amazonaws:aws-java-sdk-rds:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.amazonaws:aws-java-sdk-rds:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-rds:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-rds:1.11.106=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-rds:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.amazonaws:aws-java-sdk-s3:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.amazonaws:aws-java-sdk-s3:1.11.106=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.amazonaws:aws-java-sdk-s3:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-s3:1.11.106=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.amazonaws:aws-java-sdk-s3:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sns:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sns:1.12.366=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-sns:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.11.0=test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:aws-java-sdk-sqs:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.amazonaws:aws-java-sdk-sqs:1.12.366=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.amazonaws:aws-java-sdk-sqs:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.11.106=testCompileClasspath,testRuntimeClasspath -com.amazonaws:jmespath-java:1.12.366=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.amazonaws:jmespath-java:1.12.366=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.amazonaws:jmespath-java:1.12.797=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=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.datadoghq.okio:okio:1.17.6=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.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.datadoghq:sketches-java:0.8.3=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.12.7=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq.okio:okio:1.17.6=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.datadoghq:sketches-java:0.8.3=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.12.7=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.5.0=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.5.0=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.6.0=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.12.7=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.12.7=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.6.6=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.12.7.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.12.7.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.6.6=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.7=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.12.7=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.5.3=compileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.6.6=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.12.7=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.12.7=dsmTestCompileClasspath,dsmTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.15=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jffi:1.3.15=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 -com.google.auto.service:auto-service:1.1.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,dsmForkedTestAnnotationProcessor,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,spotbugs,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.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,test_before_1_11_106AnnotationProcessor,test_before_1_11_106CompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106AnnotationProcessor,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.google.code.gson:gson:2.14.0=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.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.errorprone:error_prone_annotations:2.18.0=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -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: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: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 -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 -com.squareup.okio:okio:1.17.5=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,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.guava:failureaccess:1.0.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.guava:guava:33.6.0-jre=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,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_106RuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.google.re2j:re2j:1.8=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +com.squareup.moshi:moshi:1.11.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +com.squareup.okio:okio:1.17.5=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc -commons-codec:commons-codec:1.15=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -commons-codec:commons-codec:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -commons-fileupload:commons-fileupload:1.5=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 -commons-io:commons-io:2.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 +commons-codec:commons-codec:1.15=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +commons-codec:commons-codec:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +commons-fileupload:commons-fileupload:1.5=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +commons-io:commons-io:2.11.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -commons-logging:commons-logging:1.2=compileClasspath,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 -de.thetaphi:forbiddenapis:3.10=compileClasspath,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 -io.leangen.geantyref:geantyref:1.3.16=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -io.sqreen:libsqreen:17.5.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -javax.servlet:javax.servlet-api:3.1.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 +commons-logging:commons-logging:1.2=compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +io.sqreen:libsqreen:17.5.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.12.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -joda-time:joda-time:2.8.1=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -junit:junit:4.13.2=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -net.java.dev.jna:jna:5.8.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +joda-time:joda-time:2.8.1=compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +junit:junit:4.13.2=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +net.java.dev.jna:jna:5.8.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc org.apache.bcel:bcel:6.12.0=spotbugs org.apache.commons:commons-lang3:3.20.0=spotbugs org.apache.commons:commons-text:1.15.0=spotbugs -org.apache.httpcomponents:httpclient:4.5.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.2=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.4=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.2=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.4=compileClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apiguardian:apiguardian-api:1.1.2=dsmForkedTestCompileClasspath,dsmTestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,latestDsmForkedTestCompileClasspath,latestDsmTestCompileClasspath,testCompileClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor,test_before_1_11_106ForkedTestAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=dsmTestCompileClasspath,latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,latestDsmForkedTestCompileClasspath,latestDsmTestCompileClasspath,testCompileClasspath,test_before_1_11_106CompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,dsmTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,testAnnotationProcessor,test_before_1_11_106AnnotationProcessor 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=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.codehaus.groovy:groovy-json:3.0.25=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath 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=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.codehaus.groovy:groovy:3.0.25=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath 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=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.hamcrest:hamcrest:3.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.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 -org.junit.jupiter:junit-jupiter: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.platform:junit-platform-commons:1.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.platform:junit-platform-engine:1.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.platform:junit-platform-launcher:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.junit:junit-bom: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:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.objenesis:objenesis:3.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 -org.opentest4j:opentest4j:1.3.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.hamcrest:hamcrest-core:1.3=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.hamcrest:hamcrest:3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.jctools:jctools-core:4.0.6=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.json:json:20231013=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.jspecify:jspecify:1.0.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.junit:junit-bom:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.mockito:mockito-core:4.4.0=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.objenesis:objenesis:3.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.opentest4j:opentest4j:1.3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,spotbugs,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,spotbugs,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,spotbugs,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,spotbugs,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106ForkedTestCompileClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=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.slf4j:jul-to-slf4j:1.7.30=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.slf4j:log4j-over-slf4j:1.7.30=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.ow2.asm:asm-util:9.7.1=dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=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.slf4j:slf4j-api:1.7.32=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,test_before_1_11_106ForkedTestRuntimeClasspath,test_before_1_11_106RuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.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.spockframework:spock-core:2.4-groovy-3.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.tabletest:tabletest-junit:1.2.2=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.tabletest:tabletest-parser:1.2.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.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,dsmTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,test_before_1_11_106RuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,test_before_1_11_106CompileClasspath,test_before_1_11_106RuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -software.amazon.ion:ion-java:1.0.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -empty=spotbugsPlugins,test_before_1_11_106TestAnnotationProcessor,test_before_1_11_106TestCompileOnly,test_before_1_11_106TestImplementation,test_before_1_11_106TestRuntimeOnly +software.amazon.ion:ion-java:1.0.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +empty=spotbugsPlugins 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 af611c111d8..9ec5e57b131 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 @@ -2,369 +2,368 @@ # Manual edits can break the build 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 -ch.qos.logback:logback-core:1.2.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.10.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.10.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.9.7=compileClasspath com.fasterxml.jackson.core:jackson-core:2.9.7=compileClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.7=compileClasspath,testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:2.9.7=testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-api:3.4.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport-zerodep:3.4.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.docker-java:docker-java-transport:3.4.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-api:3.4.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport-zerodep:3.4.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.docker-java:docker-java-transport:3.4.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.15=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jffi:1.3.15=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 -com.google.auto.service:auto-service:1.1.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,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,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestAnnotationProcessor,latestPayloadTaggingTestCompileClasspath,payloadTaggingTestAnnotationProcessor,payloadTaggingTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestAnnotationProcessor,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestAnnotationProcessor,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.14.0=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.47.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor -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: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.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 -com.squareup.okio:okio:1.17.5=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,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,dsmTestAnnotationProcessor,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestAnnotationProcessor,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestAnnotationProcessor,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestAnnotationProcessor,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestAnnotationProcessor,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc com.typesafe.netty:netty-reactive-streams-http:2.0.0=testRuntimeClasspath com.typesafe.netty:netty-reactive-streams:2.0.0=testRuntimeClasspath -commons-codec:commons-codec:1.10=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.11=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +commons-codec:commons-codec:1.10=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath commons-codec:commons-codec:1.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath commons-codec:commons-codec:1.17.1=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -commons-fileupload:commons-fileupload:1.5=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -commons-logging:commons-logging:1.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -de.thetaphi:forbiddenapis:3.10=compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-buffer:4.1.32.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-buffer:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-buffer:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-buffer:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec-http2:4.1.32.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-codec-http2:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec-http:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec-http:4.1.32.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-codec-http:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-codec-http:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-codec-http:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-codec:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-codec:4.1.32.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-codec:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-codec:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-codec:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-common:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-common:4.1.32.Final=testRuntimeClasspath -io.netty:netty-common:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-common:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-handler:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-handler:4.1.32.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-handler:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-handler:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-handler:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-resolver:4.1.32.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-resolver:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-resolver:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-resolver:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.32.Final=testRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.32.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath io.netty:netty-transport:4.1.108.Final=latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath io.netty:netty-transport:4.1.32.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.77.Final=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -io.netty:netty-transport:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath -io.sqreen:libsqreen:17.5.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.netty:netty-transport:4.1.77.Final=dsmTestCompileClasspath,dsmTestRuntimeClasspath +io.netty:netty-transport:4.1.86.Final=latestDepTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +io.sqreen:libsqreen:17.5.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -junit:junit:4.13.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.13.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.13.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc org.apache.bcel:bcel:6.12.0=spotbugs -org.apache.commons:commons-compress:1.24.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-compress:1.24.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.apache.commons:commons-lang3:3.20.0=spotbugs org.apache.commons:commons-text:1.15.0=spotbugs org.apache.httpcomponents.client5:httpclient5:5.6.4=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath org.apache.httpcomponents.core5:httpcore5-h2:5.4.3=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath org.apache.httpcomponents.core5:httpcore5:5.4.3=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath -org.apache.httpcomponents:httpclient:4.5.6=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.10=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.4.13=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.6=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.10=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.13=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath org.apache.httpcomponents:httpcore:4.4.16=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apiguardian:apiguardian-api:1.1.2=dsmForkedTestCompileClasspath,dsmTestCompileClasspath,latestDepTestCompileClasspath,latestDsmForkedTestCompileClasspath,latestDsmTestCompileClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,dsmForkedTestAnnotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingForkedTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,testAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=dsmTestCompileClasspath,latestDepTestCompileClasspath,latestDsmForkedTestCompileClasspath,latestDsmTestCompileClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,payloadTaggingTestCompileClasspath,testCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,dsmTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestDsmForkedTestAnnotationProcessor,latestDsmTestAnnotationProcessor,latestPayloadTaggingForkedTestAnnotationProcessor,latestPayloadTaggingTestAnnotationProcessor,payloadTaggingTestAnnotationProcessor,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=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.25=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,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=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.25=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.http2:http2-common:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:http2-hpack:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty.http2:http2-server:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:9.4.56.v20240826=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:http2-common:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:http2-hpack:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty.http2:http2-server:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.4.56.v20240826=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -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 -org.junit.jupiter:junit-jupiter: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.platform:junit-platform-commons:1.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom: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:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.jetbrains:annotations:17.0.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,spotbugs,testRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.reactivestreams:reactive-streams:1.0.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.reactivestreams:reactive-streams:1.0.3=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +org.reactivestreams:reactive-streams:1.0.3=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath org.reactivestreams:reactive-streams:1.0.4=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -org.rnorth.duct-tape:duct-tape:1.0.8=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.rnorth.duct-tape:duct-tape:1.0.8=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.36=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,dsmForkedTestRuntimeClasspath,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-junit:1.2.2=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:localstack:1.21.4=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.testcontainers:testcontainers:1.21.4=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,dsmTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestRuntimeClasspath,muzzleTooling,payloadTaggingTestRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:localstack:1.21.4=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.testcontainers:testcontainers:1.21.4=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -software.amazon.awssdk:annotations:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:annotations:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:annotations:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:annotations:2.19.0=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath 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.54.6=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:annotations:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.19.0=payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.2.0=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingTestCompileClasspath,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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:apigateway:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:apache-client:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDsmForkedTestRuntimeClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:apigateway:2.19.0=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:apigateway:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apigateway:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:arns:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:arns:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:arns:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:auth:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:auth:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:auth:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:auth:2.19.0=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath 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.54.6=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:auth:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-cbor-protocol:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,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.54.6=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-cbor-protocol:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.19.0=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.54.6=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-core:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.19.0=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.54.6=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-json-protocol:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath,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.54.6=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-query-protocol:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:aws-xml-protocol:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:aws-xml-protocol:2.2.0=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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:checksums:2.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=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.2.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:dynamodb:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:ec2:2.2.0=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +software.amazon.awssdk:ec2:2.2.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:ec2:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.19.0=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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:eventbridge:2.7.4=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.54.6=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-auth:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.19.0=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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.54.6=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:identity-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.19.0=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.54.6=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:json-utils:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:kinesis:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,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.54.6=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:kinesis:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.19.0=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.54.6=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:metrics-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.19.0=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.54.6=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:netty-nio-client:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:profiles:2.19.0=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.54.6=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:profiles:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.19.0=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.54.6=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:protocol-core:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:rds:2.2.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:rds:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:regions:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:regions:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:regions:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:regions:2.19.0=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath 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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:retries:2.54.6=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:regions:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:s3:2.18.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:s3:2.2.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:s3:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:sdk-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.19.0=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath 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.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:sns:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath,payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sns:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath,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.54.6=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:sns:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:sqs:2.18.40=payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:sqs:2.2.0=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath software.amazon.awssdk:sqs:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sqs:2.25.40=latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.18.40=dsmForkedTestCompileClasspath,dsmForkedTestRuntimeClasspath,dsmTestCompileClasspath,dsmTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.19.0=payloadTaggingForkedTestCompileClasspath,payloadTaggingForkedTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.19.0=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.54.6=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-core:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.20.33=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-dataformat-cbor:2.54.6=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=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:third-party-jackson-dataformat-cbor:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.18.40=dsmTestCompileClasspath,dsmTestRuntimeClasspath +software.amazon.awssdk:utils:2.19.0=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.54.6=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.awssdk:utils:2.55.0=latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath +software.amazon.eventstream:eventstream:1.0.1=dsmTestCompileClasspath,dsmTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestDsmForkedTestCompileClasspath,latestDsmForkedTestRuntimeClasspath,latestDsmTestCompileClasspath,latestDsmTestRuntimeClasspath,latestPayloadTaggingForkedTestCompileClasspath,latestPayloadTaggingForkedTestRuntimeClasspath,latestPayloadTaggingTestCompileClasspath,latestPayloadTaggingTestRuntimeClasspath,payloadTaggingTestCompileClasspath,payloadTaggingTestRuntimeClasspath software.amazon:flow:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java index 1aef1957213..7d8df3683cb 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sdk-2.2/src/main/java/datadog/trace/instrumentation/aws/v2/AwsHttpClientInstrumentation.java @@ -15,7 +15,6 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; -import datadog.trace.context.TraceScope; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; import net.bytebuddy.matcher.ElementMatcher; @@ -69,7 +68,7 @@ public static class AwsHttpClientAdvice { * stored in channel attributes. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static TraceScope methodEnter( + public static AutoCloseable methodEnter( @Advice.This final Object thiz, @Advice.Argument(1) final RequestExecutionContext requestExecutionContext) { final AgentSpan activeSpan = activeSpan(); @@ -91,7 +90,7 @@ public static TraceScope methodEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void methodExit(@Advice.Enter final TraceScope scope) { + public static void methodExit(@Advice.Enter final AutoCloseable scope) throws Exception { scope.close(); } 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 386e4dd3c65..637404a3712 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,32 +62,32 @@ commons-io:commons-io:2.21.0=spotbugs commons-logging:commons-logging:1.2=testRuntimeClasspath 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.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.53.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.53.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.53.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.53.Final=testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.53.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.53.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.53.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.53.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.53.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.53.Final=testRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -135,7 +135,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -166,45 +165,45 @@ org.tabletest:tabletest-parser:1.2.1=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-json-protocol:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-json-protocol:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:checksums:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-json-protocol:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:identity-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:json-utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.15.35=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sfn:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sfn:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:third-party-jackson-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sfn:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.15.35=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.55.0=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 a3054206503..a300ffd2aed 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 @@ -17,7 +17,7 @@ com.amazonaws:jmespath-java:1.12.797=latestDepForkedTestCompileClasspath,latestD com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -43,8 +43,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -89,8 +89,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.12.7=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -135,7 +135,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 f3fbae5ae5e..7553780010e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,31 +58,31 @@ commons-logging:commons-logging:1.2=latestDepForkedTestRuntimeClasspath,latestDe 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.1.108.Final=testRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.108.Final=testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.108.Final=testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.108.Final=testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.108.Final=testRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -160,56 +159,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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:annotations:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:apache-client:2.25.40=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -software.amazon.awssdk:apache5-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:apache5-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:aws-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:aws-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-core:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:aws-query-protocol:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:checksums:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:checksums:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:checksums:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:endpoints-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:endpoints-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:http-auth-aws-eventstream:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:endpoints-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws-eventstream:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-aws:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-aws:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-aws:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-auth:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-auth:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-auth:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:http-client-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:http-client-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:http-client-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:identity-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:identity-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:identity-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:json-utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:json-utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:json-utils:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:metrics-spi:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:metrics-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:metrics-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:netty-nio-client:2.25.40=testRuntimeClasspath -software.amazon.awssdk:netty-nio-client:2.54.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:netty-nio-client:2.55.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:profiles:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:profiles:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:profiles:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:protocol-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:protocol-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:protocol-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:regions:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:regions:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries-spi:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:retries:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:regions:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries-spi:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:retries:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sdk-core:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sdk-core:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sdk-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:sns:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:sns:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:sns:2.55.0=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.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -software.amazon.awssdk:utils-lite:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:third-party-jackson-core:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils-lite:2.55.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath software.amazon.awssdk:utils:2.25.40=compileClasspath,testCompileClasspath,testRuntimeClasspath -software.amazon.awssdk:utils:2.54.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +software.amazon.awssdk:utils:2.55.0=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 59802271d37..ed0f6e7a03d 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 @@ -20,7 +20,7 @@ com.amazonaws:jmespath-java:1.12.797=latestDepForkedTestCompileClasspath,latestD com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -46,8 +46,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -93,8 +93,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.12.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath joda-time:joda-time:2.8.1=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -152,7 +152,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.staxex:stax-ex:1.8.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 diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java index f1b3861e670..9e85f11b63c 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/src/main/java/datadog/trace/instrumentation/aws/v1/sqs/MessageAttributeInjector.java @@ -28,7 +28,7 @@ public void set( DATADOG_KEY, new MessageAttributeValue() .withDataType("String") - .withStringValue(String.format("{\"%s\": \"%s\"}", key, value))); + .withStringValue("{\"" + key + "\": \"" + value + "\"}")); } else { // _datadog was created by an earlier set() call in this same inject session; append to it. String existing = carrier.get(DATADOG_KEY).getStringValue(); @@ -38,7 +38,18 @@ public void set( int closingBrace = existing.lastIndexOf('}'); if (closingBrace >= 0) { String updated = - existing.substring(0, closingBrace) + String.format(", \"%s\": \"%s\"}", key, value); + new StringBuilder( + closingBrace + + String.valueOf(key).length() + + String.valueOf(value).length() + + 9) + .append(existing, 0, closingBrace) + .append(", \"") + .append(key) + .append("\": \"") + .append(value) + .append("\"}") + .toString(); carrier.put( DATADOG_KEY, new MessageAttributeValue().withDataType("String").withStringValue(updated)); 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 e9ef62fd648..31ce8ee4efb 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 @@ -11,7 +11,7 @@ com.amazonaws:amazon-sqs-java-messaging-lib:2.0.3=latestDepForkedTestCompileClas com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -24,8 +24,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -94,8 +94,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.13=compileClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.12.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java index 59dfb4f9e74..144e29cfbba 100644 --- a/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java +++ b/dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/src/main/java/datadog/trace/instrumentation/aws/v2/sqs/MessageAttributeInjector.java @@ -30,7 +30,7 @@ public void set( DATADOG_KEY, MessageAttributeValue.builder() .dataType("String") - .stringValue(String.format("{\"%s\": \"%s\"}", key, value)) + .stringValue("{\"" + key + "\": \"" + value + "\"}") .build()); } else { // _datadog was created by an earlier set() call in this same inject session; append to it. @@ -41,7 +41,18 @@ public void set( int closingBrace = existing.lastIndexOf('}'); if (closingBrace >= 0) { String updated = - existing.substring(0, closingBrace) + String.format(", \"%s\": \"%s\"}", key, value); + new StringBuilder( + closingBrace + + String.valueOf(key).length() + + String.valueOf(value).length() + + 9) + .append(existing, 0, closingBrace) + .append(", \"") + .append(key) + .append("\": \"") + .append(value) + .append("\"}") + .toString(); carrier.put( DATADOG_KEY, MessageAttributeValue.builder().dataType("String").stringValue(updated).build()); diff --git a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile index b81c9191a10..b423675fb42 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/axis2-1.3/gradle.lockfile @@ -12,7 +12,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -77,8 +77,8 @@ junit:junit:3.8.1=compileClasspath,testCompileClasspath junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.12=compileClasspath,testCompileClasspath,testRuntimeClasspath logkit:logkit:1.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -147,7 +147,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java index faa2bbc654a..d04e7059aec 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java +++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisEngineInstrumentation.java @@ -5,6 +5,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.AXIS2_CONTINUATION_KEY; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.AXIS2_MESSAGE; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.DECORATE; @@ -15,7 +16,6 @@ import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.api.Tracer; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import org.apache.axis2.context.MessageContext; @@ -50,7 +50,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class HandleMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginProcessingMessage( + public static ContextScope beginProcessingMessage( @Advice.Argument(0) final MessageContext message) { // only create a span if the message has a clear action and there's a surrounding request if (DECORATE.shouldTrace(message)) { @@ -64,13 +64,13 @@ public static AgentScope beginProcessingMessage( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishProcessingMessage( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Argument(0) final MessageContext message, @Advice.Thrown final Throwable error) { if (null == scope) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } @@ -82,7 +82,7 @@ public static void finishProcessingMessage( public static final class ResumeMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginResumingMessage( + public static ContextScope beginResumingMessage( @Advice.Argument(0) final MessageContext message) { Object continuation = message.getSelfManagedData(Tracer.class, AXIS2_CONTINUATION_KEY); if (continuation instanceof ContextContinuation) { @@ -100,13 +100,13 @@ public static AgentScope beginResumingMessage( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishResumingMessage( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Argument(0) final MessageContext message, @Advice.Thrown final Throwable error) { if (null == scope) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } diff --git a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java index 091a34b6a0c..a02121f0e4c 100644 --- a/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java +++ b/dd-java-agent/instrumentation/axis2-1.3/src/main/java/datadog/trace/instrumentation/axis2/AxisTransportInstrumentation.java @@ -6,6 +6,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.AXIS2_ASYNC_SPAN_KEY; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.AXIS2_TRANSPORT; import static datadog.trace.instrumentation.axis2.AxisMessageDecorator.DECORATE; @@ -13,10 +14,10 @@ import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.api.InstrumenterConfig; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Map; import java.util.TreeMap; @@ -51,7 +52,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class TransportAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginTransport(@Advice.Argument(0) final MessageContext message) { + public static ContextScope beginTransport(@Advice.Argument(0) final MessageContext message) { // only create a span if the message has a clear action and there's a surrounding request if (DECORATE.shouldTrace(message)) { AgentSpan span = startSpan("axis2", AXIS2_TRANSPORT); @@ -65,14 +66,14 @@ public static AgentScope beginTransport(@Advice.Argument(0) final MessageContext @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishTransport( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Argument(0) final MessageContext message, @Advice.Thrown final Throwable error) { if (null == scope) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { // cancel async tracking when we know there's an error message.removePropertyNonReplicable(AXIS2_ASYNC_SPAN_KEY); 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 4f18abd7706..4bc3439be6e 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/axway-api-7.5/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java index a5844cad8b9..5651c5b019d 100644 --- a/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java +++ b/dd-java-agent/instrumentation/axway-api-7.5/src/main/java/datadog/trace/instrumentation/axway/StateAdvice.java @@ -2,11 +2,12 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.axway.AxwayHTTPPluginDecorator.AXWAY_TRY_TRANSACTION; import static datadog.trace.instrumentation.axway.AxwayHTTPPluginDecorator.DECORATE; import datadog.context.Context; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -19,9 +20,9 @@ */ public class StateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.This final Object stateInstance) { + public static ContextScope onEnter(@Advice.This final Object stateInstance) { final AgentSpan span = startSpan("axway-http", AXWAY_TRY_TRANSACTION); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); span.setMeasured(true); DECORATE.onTransaction(span, stateInstance); DECORATE.afterStart(span); @@ -30,11 +31,11 @@ public static AgentScope onEnter(@Advice.This final Object stateInstance) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); final Context context = scope.context(); DECORATE.onError(span, throwable); DECORATE.beforeFinish(context); 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 0a33522a8f6..c30fa0942f6 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/beanshell-2.0/gradle.lockfile b/dd-java-agent/instrumentation/beanshell-2.0/gradle.lockfile index 8372cf890bb..6e4b2bf6291 100644 --- a/dd-java-agent/instrumentation/beanshell-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/beanshell-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile index bcb0abe293d..24c4c375bf1 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/caffeine-1.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -24,8 +24,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java index 5b2edd0b7d5..5282bf3cbcd 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java +++ b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheAdvice.java @@ -3,18 +3,18 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import net.bytebuddy.asm.Advice; public class BoundedLocalCacheAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } diff --git a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java index 7c351cc484a..b1e01e1901d 100644 --- a/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java +++ b/dd-java-agent/instrumentation/caffeine-1.0/src/main/java/datadog/trace/instrumentation/caffeine/BoundedLocalCacheInstrumentation.java @@ -6,9 +6,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -34,12 +34,12 @@ public void methodAdvice(MethodTransformer transformer) { public static class ScheduleDrainBuffers { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } diff --git a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile index 5f83a264b66..9e5872fcf06 100644 --- a/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/cdi-1.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ javax.inject:javax.inject:1=latestDepTestCompileClasspath,latestDepTestRuntimeCl javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -120,7 +120,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile index 67cf13fddd0..8dd06c5be66 100644 --- a/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cics-9.1/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.transaction:javax.transaction-api:1.3=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java index c682bb4466a..ab785206078 100644 --- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java +++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/ECIInteractionInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.cics.CicsDecorator.CICS_CLIENT; import static datadog.trace.instrumentation.cics.CicsDecorator.DECORATE; import static datadog.trace.instrumentation.cics.CicsDecorator.ECI_EXECUTE_OPERATION; import com.ibm.connector2.cics.ECIInteraction; import com.ibm.connector2.cics.ECIInteractionSpec; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -29,7 +30,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ExecuteAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.Argument(0) final Object spec) { + public static ContextScope enter(@Advice.Argument(0) final Object spec) { // Coordinating with JavaGatewayInterfaceInstrumentation CallDepthThreadLocalMap.incrementCallDepth(ECIInteraction.class); @@ -46,11 +47,11 @@ public static AgentScope enter(@Advice.Argument(0) final Object spec) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { CallDepthThreadLocalMap.decrementCallDepth(ECIInteraction.class); if (null != scope) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); diff --git a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java index 2745576e4e5..a0e020fb320 100644 --- a/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java +++ b/dd-java-agent/instrumentation/cics-9.1/src/main/java/datadog/trace/instrumentation/cics/JavaGatewayInterfaceInstrumentation.java @@ -5,14 +5,15 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.cics.CicsDecorator.CICS_CLIENT; import static datadog.trace.instrumentation.cics.CicsDecorator.DECORATE; import static datadog.trace.instrumentation.cics.CicsDecorator.GATEWAY_FLOW_OPERATION; import com.ibm.connector2.cics.ECIInteraction; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.InetAddress; import net.bytebuddy.asm.Advice; @@ -38,7 +39,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class FlowAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.FieldValue("strAddress") final String strAddress, @Advice.FieldValue("iPort") final int port, @Advice.FieldValue("ipGateway") final InetAddress ipGateway) { @@ -62,12 +63,12 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (null == scope) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); 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 c88beca154a..bb69fe584f9 100644 --- a/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-codec-1.1/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5aacc8eb572..ae99d2313ec 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java index e778a3e7d98..b7c65c95f97 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/main/java/datadog/trace/instrumentation/commons/fileupload/CommonsFileUploadAppSecInstrumentation.java @@ -93,7 +93,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); if (brf != null) { - brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (multipart file upload)"); reqCtx.getTraceSegment().effectivelyBlocked(); } @@ -107,7 +107,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) contentAction; BlockResponseFunction brf = reqCtx.getBlockResponseFunction(); if (brf != null) { - brf.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (multipart file upload content)"); reqCtx.getTraceSegment().effectivelyBlocked(); } diff --git a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/groovy/ServletFileUploadInstrumentationTest.groovy b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/groovy/ServletFileUploadInstrumentationTest.groovy index da688cd1b17..fc100e84563 100644 --- a/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/groovy/ServletFileUploadInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/commons-fileupload-1.5/src/test/groovy/ServletFileUploadInstrumentationTest.groovy @@ -1,4 +1,11 @@ +import datadog.appsec.api.blocking.BlockingContentType +import datadog.appsec.api.blocking.BlockingException import datadog.trace.agent.test.InstrumentationSpecification +import datadog.trace.api.appsec.AppSecContext +import datadog.trace.api.gateway.BlockResponseFunction +import datadog.trace.api.gateway.Flow +import datadog.trace.api.gateway.RequestContext +import datadog.trace.api.gateway.RequestContextSlot import datadog.trace.api.iast.IastContext import datadog.trace.api.iast.InstrumentationBridge import datadog.trace.api.iast.SourceTypes @@ -11,10 +18,16 @@ import org.apache.commons.fileupload.FileItemIterator import org.apache.commons.fileupload.disk.DiskFileItemFactory import org.apache.commons.fileupload.servlet.ServletFileUpload +import java.util.function.BiFunction + +import static datadog.trace.api.gateway.Events.EVENTS + class ServletFileUploadInstrumentationTest extends InstrumentationSpecification { private Object iastCtx + private final appSecSubscriptionService = AgentTracer.get().getSubscriptionService(RequestContextSlot.APPSEC) + @Override protected void configurePreAgent() { injectSysConfig('dd.iast.enabled', 'true') @@ -28,6 +41,7 @@ class ServletFileUploadInstrumentationTest extends InstrumentationSpecification @Override void cleanup() { InstrumentationBridge.clearIastModules() + appSecSubscriptionService.reset() } void 'test commons fileupload ServletFileUpload parseRequest'() { @@ -93,6 +107,73 @@ class ServletFileUploadInstrumentationTest extends InstrumentationSpecification 1 * module.taintObject(iastCtx, _ as FileItemIterator, SourceTypes.REQUEST_MULTIPART_PARAMETER) } + void 'test appsec commits the filenames blocking response with the request context'() { + given: + final appSecCtx = Stub(AppSecContext) + final brf = Mock(BlockResponseFunction) + appSecSubscriptionService.registerCallback(EVENTS.requestFilesFilenames(), { RequestContext reqCtx, List filenames -> + blockingFlow() + } as BiFunction, Flow>) + final servletFileUpload = new ServletFileUpload(new DiskFileItemFactory()) + + when: + runUnderAppSecTrace(appSecCtx, brf) { servletFileUpload.parseRequest(multipartRequest()) } + + then: + thrown(BlockingException) + 1 * brf.tryCommitBlockingResponse(_ as RequestContext, _ as Flow.Action.RequestBlockingAction) >> true + } + + void 'test appsec commits the file content blocking response with the request context'() { + given: + final appSecCtx = Stub(AppSecContext) + final brf = Mock(BlockResponseFunction) + appSecSubscriptionService.registerCallback(EVENTS.requestFilesContent(), { RequestContext reqCtx, List contents -> + blockingFlow() + } as BiFunction, Flow>) + final servletFileUpload = new ServletFileUpload(new DiskFileItemFactory()) + + when: + runUnderAppSecTrace(appSecCtx, brf) { servletFileUpload.parseRequest(multipartRequest()) } + + then: + thrown(BlockingException) + 1 * brf.tryCommitBlockingResponse(_ as RequestContext, _ as Flow.Action.RequestBlockingAction) >> true + } + + private static MockHttpServletRequest multipartRequest() { + final body = "Content-Disposition: form-data; name=\"file\"; filename=\"test.txt\"\r\n" + + "Content-Type: text/plain\r\n" + + "\r\n" + + "This is a test file.\r\n" + new MockHttpServletRequest('multipart/form-data', body, 'UTF-8') + } + + private static Flow blockingFlow() { + new Flow() { + @Override + Flow.Action getAction() { + new Flow.Action.RequestBlockingAction(403, BlockingContentType.JSON) + } + + @Override + Void getResult() { + null + } + } + } + + protected E runUnderAppSecTrace(Object appSecCtx, BlockResponseFunction brf, Closure cl) { + final ddctx = new TagContext().withRequestContextDataAppSec(appSecCtx) + final span = TEST_TRACER.startSpan("test", "test-appsec-span", ddctx) + span.requestContext.blockResponseFunction = brf + try { + return AgentTracer.activateSpan(span).withCloseable(cl) + } finally { + span.finish() + } + } + protected E runUnderIastTrace(Closure cl) { final ddctx = new TagContext().withRequestContextDataIast(iastCtx) final span = TEST_TRACER.startSpan("test", "test-iast-span", ddctx) 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 5512ff56143..9937360fc09 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java index d7625157562..f7a64539c31 100644 --- a/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/commons-httpclient-2.0/src/main/java/datadog/trace/instrumentation/commonshttpclient/CommonsHttpClientInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.commonshttpclient.CommonsHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.commonshttpclient.HttpHeadersInjectAdapter.SETTER; @@ -14,11 +15,11 @@ import com.google.auto.service.AutoService; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import org.apache.commons.httpclient.HttpClient; @@ -57,7 +58,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ExecAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) { + public static ContextScope methodEnter(@Advice.Argument(1) final HttpMethod httpMethod) { try { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(HttpClient.class); @@ -66,7 +67,7 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe } final AgentSpan span = startSpan("commons-http-client", HTTP_REQUEST); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onRequest(span, httpMethod); @@ -81,14 +82,14 @@ public static AgentScope methodEnter(@Advice.Argument(1) final HttpMethod httpMe @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Argument(1) final HttpMethod httpMethod, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onResponse(span, httpMethod); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); 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 ead4baa611d..f7e7decef1a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 856b95f779b..90d2d3b4e9e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 2391c8008c1..06ac2b5f80e 100644 --- a/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/commons-text-1.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 436b5f86ffa..bf4b7c86201 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 @@ -2,7 +2,7 @@ # Manual edits can break the build and are not advised. # This file is expected to be part of source control. # 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 +at.yawk.lz4:lz4-java:1.11.1=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 @@ -11,24 +11,24 @@ com.101tec:zkclient:0.10=compileClasspath 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-instrument-java:0.0.5=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.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.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=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.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.22.1=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.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.22.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.9.4=compileClasspath -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.dataformat:jackson-dataformat-csv:2.22.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.22.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.14.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.22.1=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -75,16 +75,16 @@ 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.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:common-utils:8.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:kafka-avro-serializer:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:kafka-avro-serializer:8.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.confluent:kafka-avro-types:8.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-avro-serializer:8.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-avro-types:8.3.2=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.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-registry-client:8.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:kafka-schema-serializer:7.4.0=testCompileClasspath,testRuntimeClasspath -io.confluent:kafka-schema-serializer:8.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.confluent:kafka-schema-types:8.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-serializer:8.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.confluent:kafka-schema-types:8.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:logredactor-metrics:1.0.11=testCompileClasspath,testRuntimeClasspath io.confluent:logredactor-metrics:1.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.confluent:logredactor:1.0.11=testCompileClasspath,testRuntimeClasspath @@ -99,8 +99,8 @@ jaxen:jaxen:2.0.6=spotbugs jline:jline:0.9.94=compileClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.16=compileClasspath -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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -116,12 +116,12 @@ org.apache.commons:commons-compress:1.8.1=compileClasspath org.apache.commons:commons-lang3:3.18.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.commons:commons-lang3:3.20.0=spotbugs org.apache.commons:commons-text:1.15.0=spotbugs -org.apache.httpcomponents.client5:httpclient5:5.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5-h2:5.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.httpcomponents.core5:httpcore5:5.3.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.client5:httpclient5:5.6.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5-h2:5.4.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents.core5:httpcore5:5.4.3=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.3.1-ccs=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.kafka:kafka-clients:8.3.2-ccs=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.zookeeper:zookeeper:3.4.10=compileClasspath @@ -157,7 +157,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.4=compileClasspath org.lz4:lz4-java:1.8.0=testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -189,5 +188,6 @@ org.xerial.snappy:snappy-java:1.1.10.7=latestDepTestRuntimeClasspath org.xerial.snappy:snappy-java:1.1.7.1=compileClasspath org.xerial.snappy:snappy-java:1.1.8.4=testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.yaml:snakeyaml:2.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.0=testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:2.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath empty=spotbugsPlugins 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 79a80d8c579..ad99d833aba 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/gradle.lockfile @@ -18,7 +18,7 @@ com.couchbase.client:java-client:2.7.23=latestDepTestCompileClasspath,latestDepT com.couchbase.mock:CouchbaseMock:1.5.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -37,8 +37,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -75,8 +75,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy index 89f6593e06b..3e8b39dcaeb 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.0/src/test/groovy/springdata/CouchbaseSpringTemplateTest.groovy @@ -17,12 +17,6 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan @Flaky class CouchbaseSpringTemplateTest extends AbstractCouchbaseTest { - @Override - boolean useStrictTraceWrites() { - // TODO fix this by making sure that spans get closed properly - return false - } - @Shared List templates 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 143445fafb5..127dcce6194 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-2.6/gradle.lockfile @@ -18,7 +18,7 @@ com.couchbase.client:java-client:2.7.23=latestDepTestCompileClasspath,latestDepT com.couchbase.mock:CouchbaseMock:1.5.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -37,8 +37,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -73,8 +73,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -115,7 +115,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e96054f1533..3ae8f1de9f7 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.1/gradle.lockfile @@ -13,7 +13,7 @@ com.couchbase.client:java-client:3.1.0=compileClasspath,testCompileClasspath,tes com.couchbase.client:java-client:3.1.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -65,8 +65,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 2c5852ce31b..5c0de68a301 100644 --- a/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/couchbase/couchbase-3.2/gradle.lockfile @@ -8,12 +8,12 @@ ch.qos.logback:logback-classic:1.2.13=latestDepTestCompileClasspath,latestDepTes 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.couchbase.client:core-io:2.2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.couchbase.client:core-io:3.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.couchbase.client:java-client:3.12.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.couchbase.client:core-io:3.12.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.couchbase.client:java-client:3.12.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.couchbase.client:java-client:3.2.0=compileClasspath,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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -65,8 +65,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile index bcc35b73f53..4865bc1bcf1 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/cucumber-5.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -52,24 +52,24 @@ commons-io:commons-io:2.21.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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-java:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit-platform-engine:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:datatable:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:docstring:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.8=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 @@ -87,8 +87,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -145,7 +145,6 @@ org.junit.platform:junit-platform-suite:1.14.1=testCompileClasspath,testRuntimeC org.junit.platform:junit-platform-suite:1.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java index e9315bde090..1d39b8b3396 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java +++ b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberInstrumentation.java @@ -6,9 +6,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 io.cucumber.core.backend.StepDefinition; import net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; @@ -47,13 +47,13 @@ public void methodAdvice(MethodTransformer transformer) { public static class CucumberAdvice { @Advice.OnMethodEnter - public static AgentScope onCucumberStepStart( + public static ContextScope onCucumberStepStart( @Advice.This StepDefinition step, @Advice.Argument(0) Object[] arguments) { return CucumberStepDecorator.DECORATE.onStepStart(step, arguments); } @Advice.OnMethodExit - public static void onCucumberStepFinish(@Advice.Enter AgentScope scope) { + public static void onCucumberStepFinish(@Advice.Enter ContextScope scope) { CucumberStepDecorator.DECORATE.onStepFinish(scope); } diff --git a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java index f0ad990cead..6f9e37f4fe5 100644 --- a/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java +++ b/dd-java-agent/instrumentation/cucumber-5.4/src/main/java/datadog/trace/instrumentation/cucumber/CucumberStepDecorator.java @@ -1,6 +1,8 @@ package datadog.trace.instrumentation.cucumber; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; + +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; @@ -26,7 +28,7 @@ protected CharSequence component() { return "cucumber"; } - public AgentScope onStepStart(StepDefinition step, Object[] arguments) { + public ContextScope onStepStart(StepDefinition step, Object[] arguments) { AgentSpan span = AgentTracer.startSpan("cucumber", "cucumber.step"); afterStart(span); @@ -41,8 +43,8 @@ public AgentScope onStepStart(StepDefinition step, Object[] arguments) { return AgentTracer.activateSpan(span); } - public void onStepFinish(AgentScope scope) { - AgentSpan span = scope.span(); + public void onStepFinish(ContextScope scope) { + AgentSpan span = spanFromScope(scope); beforeFinish(span); scope.close(); span.finish(); diff --git a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile index ac21e0b315f..67adeb1d12f 100644 --- a/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/cxf-2.1/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=cxf3LatestDepTestCompileClasspath,cxf3LatestD com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -25,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,cxf3LatestDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -79,8 +79,8 @@ javax.xml.bind:jaxb-api:2.1=compileClasspath javax.xml.bind:jaxb-api:2.3.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -177,7 +177,6 @@ org.junit.platform:junit-platform-runner:1.14.1=cxf3LatestDepTestRuntimeClasspat org.junit.platform:junit-platform-suite-api:1.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=cxf3LatestDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=cxf3LatestDepTestCompileClasspath,cxf3LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 c2816c1c2bc..870171e3af0 100644 --- a/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/asm/iast-instrumenter/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 a1c6f0fc90c..23e271c9bc4 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 3ea68ec010a..0f756727e05 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDep4TestCompileClasspath,latestDep4Test com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -53,7 +53,7 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDep4TestCompileClasspath,l io.leangen.geantyref:geantyref:1.3.16=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-all:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-haproxy:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -67,7 +67,7 @@ io.netty:netty-codec-stomp:4.1.108.Final=latestDep4TestCompileClasspath,latestDe io.netty:netty-codec-xml:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler-ssl-ocsp:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -75,7 +75,7 @@ io.netty:netty-resolver-dns-classes-macos:4.1.108.Final=latestDep4TestCompileCla io.netty:netty-resolver-dns-native-macos:4.1.108.Final=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-resolver-dns:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-classes-epoll:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-classes-kqueue:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.108.Final=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -85,13 +85,13 @@ io.netty:netty-transport-rxtx:4.1.108.Final=latestDep4TestCompileClasspath,lates io.netty:netty-transport-sctp:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport-udt:4.1.108.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.108.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -132,7 +132,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDep4TestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 5d202ce9c53..6f171d3abf3 100644 --- a/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/profiling/exception-profiling/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=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 61c2d31c038..1ae84ef4a3d 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java index 9248a676519..d43d2aab353 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/DoNotTraceAdvice.java @@ -2,27 +2,30 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.blackholeSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.trace_annotation.TraceDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import java.lang.invoke.MethodType; import net.bytebuddy.asm.Advice; import net.bytebuddy.implementation.bytecode.assign.Assigner; public class DoNotTraceAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before() { + public static ContextScope before() { return activateSpan(blackholeSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Origin final MethodType methodType, @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result) { if (scope != null) { scope.close(); - result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), scope.span()); + result = + DECORATE.wrapAsyncResultOrFinishSpan( + result, methodType.returnType(), spanFromScope(scope)); } } } diff --git a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java index c737f6845d6..493202c1f9e 100644 --- a/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java +++ b/dd-java-agent/instrumentation/datadog/tracing/trace-annotation/src/main/java/datadog/trace/instrumentation/trace_annotation/TraceAdvice.java @@ -3,9 +3,10 @@ import static datadog.trace.bootstrap.debugger.DebuggerContext.captureCodeOrigin; import static datadog.trace.bootstrap.debugger.DebuggerContext.marker; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.trace_annotation.TraceDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import java.lang.invoke.MethodType; import java.lang.reflect.Method; import net.bytebuddy.asm.Advice; @@ -14,8 +15,8 @@ public class TraceAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Origin final Method method) { - AgentScope agentScope = activateSpan(DECORATE.startMethodSpan(method)); + public static ContextScope onEnter(@Advice.Origin final Method method) { + ContextScope agentScope = activateSpan(DECORATE.startMethodSpan(method)); marker(); captureCodeOrigin(method, true); return agentScope; @@ -23,7 +24,7 @@ public static AgentScope onEnter(@Advice.Origin final Method method) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result, @Advice.Origin final MethodType methodType, @Advice.Thrown final Throwable throwable) { @@ -32,6 +33,7 @@ public static void stopSpan( scope.close(); // we must check against the method return signature and not the type of the returned object // otherwise we'll risk to have class cast at runtime - result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), scope.span()); + result = + DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope)); } } 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 5baf9cb084f..82dcc447c15 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.transaction:transaction-api:1.1=compileClasspath,datanucleusEnhancer,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java index 74518e0cee8..d2d2c2d2e73 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/ExecutionContextInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_FIND_OBJECT; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; @@ -13,9 +14,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.api.InstrumenterConfig; -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; @@ -75,7 +76,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class MultiObjectActionAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startMethod( + public static ContextScope startMethod( @Advice.This final ExecutionContext executionContext, @Advice.Origin("datanucleus.#m") final String operationName) { @@ -87,13 +88,13 @@ public static AgentScope startMethod( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void endMethod( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); @@ -104,7 +105,7 @@ public static void endMethod( public static class SingleObjectActionAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startMethod( + public static ContextScope startMethod( @Advice.Origin("datanucleus.#m") final String operationName, @Advice.Argument(0) Object entity) { @@ -120,7 +121,7 @@ public static AgentScope startMethod( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void endMethod( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Argument(0) Object entity) { @@ -128,7 +129,7 @@ public static void endMethod( return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.onOperation(span, entity); DECORATE.beforeFinish(span); @@ -140,7 +141,7 @@ public static void endMethod( public static class FindWithStringClassnameAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startMethod() { + public static ContextScope startMethod() { final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT); DECORATE.afterStart(span); @@ -150,7 +151,7 @@ public static AgentScope startMethod() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void endMethod( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Argument(0) Object id, @Advice.Argument(3) String objectClassName) { @@ -159,7 +160,7 @@ public static void endMethod( return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.setResourceFromIdOrClass(span, id, objectClassName); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); @@ -171,7 +172,7 @@ public static void endMethod( public static class FindWithClassAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startMethod() { + public static ContextScope startMethod() { final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), DATANUCLEUS_FIND_OBJECT); DECORATE.afterStart(span); @@ -181,7 +182,7 @@ public static AgentScope startMethod() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void endMethod( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Argument(0) Object id, @Advice.Argument(2) Class cls) { @@ -190,7 +191,7 @@ public static void endMethod( return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.setResourceFromIdOrClass(span, id, cls == null ? null : cls.getName()); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java index abd3fb76f1c..a072d175e2f 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOQueryInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_QUERY_DELETE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DATANUCLEUS_QUERY_EXECUTE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import org.datanucleus.api.jdo.JDOQuery; @@ -49,7 +50,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class QueryAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startExecute(@Advice.Origin("#m") final String methodName) { + public static ContextScope startExecute(@Advice.Origin("#m") final String methodName) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(JDOQuery.class); if (callDepth > 0) { return null; @@ -67,7 +68,7 @@ public static AgentScope startExecute(@Advice.Origin("#m") final String methodNa @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void endExecute( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.FieldValue("query") Query internalQuery, @Advice.Thrown final Throwable throwable) { @@ -77,7 +78,7 @@ public static void endExecute( CallDepthThreadLocalMap.reset(JDOQuery.class); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); // candidateClass is set internally and is not always in sync with candidateClassName String candidateClassName = diff --git a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java index a3158a7d3c0..3a5364dce49 100644 --- a/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java +++ b/dd-java-agent/instrumentation/datanucleus-4.0.5/src/main/java/datadog/trace/instrumentation/datanucleus/JDOTransactionInstrumentation.java @@ -3,12 +3,13 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.DECORATE; import static datadog.trace.instrumentation.datanucleus.DatanucleusDecorator.JAVA_DATANUCLEUS; import static net.bytebuddy.matcher.ElementMatchers.isMethod; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -29,7 +30,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class TransactionAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope start( + public static ContextScope start( @Advice.Origin("datanucleus.transaction.#m") final String operationName) { final AgentSpan span = startSpan(JAVA_DATANUCLEUS.toString(), operationName); @@ -40,13 +41,13 @@ public static AgentScope start( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void end( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); 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 e878268cdf2..a0e4f815d2d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -86,8 +86,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -129,7 +129,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java index 1a30d565298..076d57e1157 100644 --- a/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java +++ b/dd-java-agent/instrumentation/datastax-cassandra/datastax-cassandra-3.0/src/main/java/datadog/trace/instrumentation/datastax/cassandra/TracingSession.java @@ -3,6 +3,7 @@ import static com.google.common.util.concurrent.MoreExecutors.directExecutor; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.DECORATE; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.JAVA_CASSANDRA; import static datadog.trace.instrumentation.datastax.cassandra.CassandraClientDecorator.OPERATION_NAME; @@ -20,7 +21,7 @@ import com.google.common.base.Function; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; -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; @@ -77,48 +78,51 @@ public ListenableFuture initAsync() { @Override public ResultSet execute(final String query) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { + final AgentSpan span = spanFromScope(scope); try { final ResultSet resultSet = session.execute(query); - beforeSpanFinish(scope.span(), resultSet); + beforeSpanFinish(span, resultSet); return resultSet; } catch (final RuntimeException e) { - beforeSpanFinish(scope.span(), e); + beforeSpanFinish(span, e); throw e; } finally { - scope.span().finish(); + span.finish(); } } } @Override public ResultSet execute(final String query, final Object... values) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { + final AgentSpan span = spanFromScope(scope); try { final ResultSet resultSet = session.execute(query, values); - beforeSpanFinish(scope.span(), resultSet); + beforeSpanFinish(span, resultSet); return resultSet; } catch (final RuntimeException e) { - beforeSpanFinish(scope.span(), e); + beforeSpanFinish(span, e); throw e; } finally { - scope.span().finish(); + span.finish(); } } } @Override public ResultSet execute(final String query, final Map values) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { + final AgentSpan span = spanFromScope(scope); try { final ResultSet resultSet = session.execute(query, values); - beforeSpanFinish(scope.span(), resultSet); + beforeSpanFinish(span, resultSet); return resultSet; } catch (final RuntimeException e) { - beforeSpanFinish(scope.span(), e); + beforeSpanFinish(span, e); throw e; } finally { - scope.span().finish(); + span.finish(); } } } @@ -126,25 +130,26 @@ public ResultSet execute(final String query, final Map values) { @Override public ResultSet execute(final Statement statement) { final String query = getQuery(statement); - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { + final AgentSpan span = spanFromScope(scope); try { final ResultSet resultSet = session.execute(statement); - beforeSpanFinish(scope.span(), resultSet); + beforeSpanFinish(span, resultSet); return resultSet; } catch (final RuntimeException e) { - beforeSpanFinish(scope.span(), e); + beforeSpanFinish(span, e); throw e; } finally { - scope.span().finish(); + span.finish(); } } } @Override public ResultSetFuture executeAsync(final String query) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { final ResultSetFuture future = session.executeAsync(query); - future.addListener(createListener(scope.span(), future), EXECUTOR_SERVICE); + future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE); return future; } @@ -152,9 +157,9 @@ public ResultSetFuture executeAsync(final String query) { @Override public ResultSetFuture executeAsync(final String query, final Object... values) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { final ResultSetFuture future = session.executeAsync(query, values); - future.addListener(createListener(scope.span(), future), EXECUTOR_SERVICE); + future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE); return future; } @@ -162,9 +167,9 @@ public ResultSetFuture executeAsync(final String query, final Object... values) @Override public ResultSetFuture executeAsync(final String query, final Map values) { - try (final AgentScope scope = startSpanWithScope(query)) { + try (final ContextScope scope = startSpanWithScope(query)) { final ResultSetFuture future = session.executeAsync(query, values); - future.addListener(createListener(scope.span(), future), EXECUTOR_SERVICE); + future.addListener(createListener(spanFromScope(scope), future), EXECUTOR_SERVICE); return future; } @@ -173,9 +178,9 @@ public ResultSetFuture executeAsync(final String query, final Map classLoaderMatcher() { + return new ElementMatcher.Junction.ForNonNullValues() { + @Override + protected boolean doMatch(ClassLoader loader) { + return INTERNAL_TYPES_CLASSLOADER_NAME.equals(loader.getClass().getName()); + } + }; + } + + @Override + public String instrumentedType() { + return "example.GeneratedFact"; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice(isConstructor(), "test.ConstructorAdvice"); + } +} diff --git a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/resources/example/rules.drl b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/resources/example/rules.drl index ef54b5c2c51..a08a4ca8145 100644 --- a/dd-java-agent/instrumentation/drools/drools-6.0/src/test/resources/example/rules.drl +++ b/dd-java-agent/instrumentation/drools/drools-6.0/src/test/resources/example/rules.drl @@ -2,6 +2,10 @@ package example import example.Person +declare GeneratedFact + value : String +end + rule "Mark person as adult" when $p : Person(age >= 18, adult == false) 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 83a6d811ca4..5f9030e1232 100644 --- a/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/dropwizard/dropwizard-0.8/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -96,8 +96,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.7=testCompileClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -173,7 +173,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:1.10.17=testCompileClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=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 3be775e0013..3f71f42111a 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 @@ -20,7 +20,7 @@ com.codahale.metrics:metrics-logback:3.0.1=compileClasspath,testCompileClasspath com.codahale.metrics:metrics-servlets:3.0.1=compileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -44,8 +44,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.8.14=testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -100,8 +100,8 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath,testCompileClasspat jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.3=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -157,7 +157,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 119516a05f3..beb5686e3ad 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 @@ -5,14 +5,15 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 datadog.trace.bootstrap.instrumentation.api.Tags; import io.dropwizard.views.View; @@ -64,7 +65,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RenderAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final Object obj, @Advice.Argument(0) final View view) { if (activeSpan() == null) { return null; @@ -78,11 +79,11 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { span.setError(true); span.addThrowable(throwable); diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile index 2548c1e85ae..05697667a0b 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-common/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=compileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -70,8 +70,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.8.2=compileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -133,7 +133,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.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 3d0f3f52e17..042b81a2173 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -31,8 +31,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -78,8 +78,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.4=testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.9.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:4.2.2=testCompileClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -173,7 +173,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java index 8ebc3b9e9e8..cab6fb252bc 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5RestClientInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.client.ResponseListener; @@ -55,7 +56,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchRestClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final String method, @Advice.Argument(1) final String endpoint, @Advice.Argument(value = 5, readOnly = false) ResponseListener responseListener) { @@ -71,9 +72,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 8435f1bce46..f0e93a9f043 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -31,8 +31,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 @@ -84,8 +84,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10=testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -188,7 +188,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java index 93fc4e3948f..eacb7bab4b5 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-6.4/src/main/java/datadog/trace/instrumentation/elasticsearch6_4/Elasticsearch6RestClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME; @@ -11,9 +12,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.client.Request; @@ -54,7 +55,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchRestClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Request request, @Advice.Argument(value = 1, readOnly = false) ResponseListener responseListener) { @@ -74,9 +75,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 cd2cfa28fb2..ac120a708d7 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 @@ -11,7 +11,7 @@ com.carrotsearch:hppc:0.7.1=testCompileClasspath,testRuntimeClasspath com.carrotsearch:hppc:0.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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-instrument-java:0.0.5=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 @@ -32,8 +32,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 @@ -85,8 +85,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.1=testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -192,7 +192,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java index 92430e40ec2..24a3eaa0148 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-rest/elasticsearch-rest-7.0/src/main/java/datadog/trace/instrumentation/elasticsearch7/Elasticsearch7RestClientInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchRestClientDecorator.OPERATION_NAME; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import net.bytebuddy.implementation.bytecode.assign.Assigner; @@ -70,7 +71,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchRestClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Request request, @Advice.Argument(value = 1, readOnly = false, optional = true) ResponseListener responseListener) { @@ -93,17 +94,17 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); span.finish(); } else if (result instanceof Response) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (((Response) result).getHost() != null) { DECORATE.onResponse(span, ((Response) result)); } 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 8ac2a3e2ca6..961ca0314ed 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 @@ -11,7 +11,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -38,8 +38,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -85,8 +85,8 @@ joda-time:joda-time:2.8.2=compileClasspath joda-time:joda-time:2.9.2=testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.9.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:4.5.1=latestDepTestCompileClasspath,testCompileClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -177,7 +177,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java index 642366895fc..22697ceba52 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-2.0/src/main/java/datadog/trace/instrumentation/elasticsearch2/Elasticsearch2TransportClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.OPERATION_NAME; @@ -10,9 +11,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.action.Action; @@ -58,7 +59,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchTransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Action action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -75,9 +76,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 b1881828bac..857adbc70e4 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=compileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -73,8 +73,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.4=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:4.2.2=compileClasspath,testCompileClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath @@ -149,7 +149,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java index 831580a2363..28afc82b20b 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.0/src/main/java/datadog/trace/instrumentation/elasticsearch5/Elasticsearch5TransportClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.OPERATION_NAME; @@ -10,9 +11,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.action.Action; @@ -58,7 +59,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchTransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Action action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -75,9 +76,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 50e40cecbe5..d85e8c75cb0 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -32,8 +32,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -96,8 +96,8 @@ joda-time:joda-time:2.10=latestDepTestCompileClasspath,latestDepTestRuntimeClass joda-time:joda-time:2.9.5=compileClasspath joda-time:joda-time:2.9.9=testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:4.2.2=compileClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -225,7 +225,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.locationtech.spatial4j:spatial4j:0.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java index 4fe2617d330..81975a43382 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-5.3/src/main/java/datadog/trace/instrumentation/elasticsearch5_3/Elasticsearch53TransportClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.OPERATION_NAME; @@ -10,9 +11,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.action.Action; @@ -59,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ElasticsearchTransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Action action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -76,9 +77,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 f9cdd563e15..2b51b98f76c 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.7.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -31,8 +31,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -85,8 +85,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath joda-time:joda-time:2.9.5=compileClasspath,testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -191,7 +191,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java index 14c81617e0b..7cc856c19f1 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-6.0/src/main/java/datadog/trace/instrumentation/elasticsearch6/Elasticsearch6TransportClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.OPERATION_NAME; @@ -10,9 +11,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.elasticsearch.action.Action; @@ -62,7 +63,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class Elasticsearch6TransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Action action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -79,9 +80,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 d880f278414..d4059433c26 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.8.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -31,8 +31,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath,testCompileClasspath,testRuntimeClasspath com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs @@ -85,8 +85,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.2=compileClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.10.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -199,7 +199,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java index 0dcb52a6d98..67e43ed64c9 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-7.3/src/main/java/datadog/trace/instrumentation/elasticsearch7_3/Elasticsearch73TransportClientInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.ELASTICSEARCH_JAVA; import static datadog.trace.instrumentation.elasticsearch.ElasticsearchTransportClientDecorator.OPERATION_NAME; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import net.bytebuddy.matcher.ElementMatcher; @@ -69,7 +70,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class Elasticsearch73TransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final ActionType action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -86,9 +87,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 d65416ae4f0..7cf5bf8d8ad 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.8.1=compileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.3=compileClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,testAnnotationProcessor,testCompileClasspath @@ -72,8 +72,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.2=compileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=compileClasspath @@ -152,7 +152,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java index 8f81e315c95..11a07a6732f 100644 --- a/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java +++ b/dd-java-agent/instrumentation/elasticsearch/elasticsearch-transport/elasticsearch-transport-common/src/main/java/datadog/trace/instrumentation/elasticsearch/ShadowExistingScopeAdvice.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import net.bytebuddy.asm.Advice; /** @@ -13,12 +13,12 @@ public class ShadowExistingScopeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } diff --git a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile index f7e310c098b..9a7b4c8adf5 100644 --- a/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/finatra-2.9/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath @@ -56,8 +56,8 @@ com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,latestPre207 com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath com.github.nscala-time:nscala-time_2.11:2.14.0=compileClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.nscala-time:nscala-time_2.11:2.22.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.8.18=compileClasspath com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestPre207ForkedTestAnnotationProcessor,latestPre207ForkedTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -352,8 +352,8 @@ joda-time:joda-time:2.10.8=latestDepTestCompileClasspath,latestDepTestRuntimeCla joda-time:joda-time:2.9.4=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.12=latestDepTestCompileClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.codingwell:scala-guice_2.11:4.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath net.codingwell:scala-guice_2.11:4.2.0=latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath net.codingwell:scala-guice_2.11:4.2.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -418,7 +418,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,la org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,latestPre207ForkedTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPre207ForkedTestCompileClasspath,latestPre207ForkedTestRuntimeClasspath,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 4d8f39032f2..449efdcbc4a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 8026ff556b0..f4d2c638a7e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath,ver com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath,version2_3_23TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath,version2_3_23TestRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor,version2_3_23TestAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath,version2_3_23TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testRuntimeClasspath,version2_3_ org.junit.platform:junit-platform-suite-api:1.14.1=testRuntimeClasspath,version2_3_23TestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testRuntimeClasspath,version2_3_23TestRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath,version2_3_23TestRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath,version2_3_23TestCompileClasspath,version2_3_23TestRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f1ce1672b7b..d171d8df0a9 100644 --- a/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/gax-1.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,29 +23,29 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs -com.google.api.grpc:proto-google-common-protos:2.75.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.76.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:api-common:1.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.67.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:api-common:2.68.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:gax:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.84.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax:2.85.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auth:google-auth-library-credentials:0.7.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.51.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.52.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.51.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.52.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 -com.google.code.gson:gson:2.14.0=spotbugs +com.google.code.gson:gson:2.14.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +com.google.errorprone:error_prone_annotations:2.48.0=spotbugs +com.google.errorprone:error_prone_annotations:2.50.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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:19.0=compileClasspath @@ -73,7 +73,7 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeC commons-io:commons-io:2.21.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.82.4=latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.83.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 @@ -83,8 +83,8 @@ javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -129,7 +129,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile index 0a1d76b57a7..00c4ca2c2df 100644 --- a/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/glassfish-3.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e94dce6d2d6..3e91d050a66 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -64,8 +64,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -110,7 +110,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java index 769976bfc7a..2c3393300fc 100644 --- a/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/google-http-client-1.19/src/main/java/datadog/trace/instrumentation/googlehttpclient/GoogleHttpClientInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.googlehttpclient.GoogleHttpClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.googlehttpclient.HeadersInjectAdapter.SETTER; @@ -17,10 +18,10 @@ import com.google.api.client.http.HttpRequest; import com.google.api.client.http.HttpResponse; 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.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -67,7 +68,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class GoogleHttpClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This HttpRequest request, @Advice.Local("inherited") AgentSpan inheritedSpan) { AgentSpan activeSpan = activeSpan(); // detect if span was propagated here by java-concurrent handling @@ -87,11 +88,11 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Local("inherited") AgentSpan inheritedSpan, @Advice.Return final HttpResponse response, @Advice.Thrown final Throwable throwable) { - AgentSpan span = scope != null ? scope.span() : inheritedSpan; + AgentSpan span = scope != null ? spanFromScope(scope) : inheritedSpan; DECORATE.onError(span, throwable); DECORATE.onResponse(span, response); DECORATE.beforeFinish(span); @@ -105,7 +106,7 @@ public static void methodExit( public static class GoogleHttpClientAsyncAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.This HttpRequest request) { + public static ContextScope methodEnter(@Advice.This HttpRequest request) { AgentSpan span = startSpan("google-http-client", HTTP_REQUEST); DECORATE.prepareSpan(span, request); return activateSpan(span); @@ -113,8 +114,8 @@ public static AgentScope methodEnter(@Advice.This HttpRequest request) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter AgentScope scope, @Advice.Thrown final Throwable throwable) { - final AgentSpan span = scope.span(); + @Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) { + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); 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 35d1b99ded4..c043a2a8611 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,42 +26,42 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-cloud-pubsub-v1:1.154.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-cloud-pubsub-v1:1.155.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api.grpc:proto-google-cloud-pubsub-v1:1.98.0=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.7.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-common-protos:2.75.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-common-protos:2.76.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api.grpc:proto-google-iam-v1:1.2.6=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api.grpc:proto-google-iam-v1:1.70.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api.grpc:proto-google-iam-v1:1.71.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:api-common:2.1.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:api-common:2.67.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:api-common:2.68.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:gax-grpc:2.12.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax-grpc:2.84.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.google.api:gax-httpjson:2.84.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax-grpc:2.85.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax-httpjson:2.85.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.api:gax:2.12.2=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.api:gax:2.84.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.api:gax:2.85.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auth:google-auth-library-credentials:1.5.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-credentials:1.51.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-credentials:1.52.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auth:google-auth-library-oauth2-http:1.5.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.auth:google-auth-library-oauth2-http:1.51.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.auth:google-auth-library-oauth2-http:1.52.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.value:auto-value-annotations:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.auto.value:auto-value-annotations:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.cloud:google-cloud-pubsub:1.116.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.google.cloud:google-cloud-pubsub:1.154.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.google.cloud:google-cloud-pubsub:1.155.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 -com.google.code.gson:gson:2.14.0=spotbugs +com.google.code.gson:gson:2.14.0=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 com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath -com.google.errorprone:error_prone_annotations:2.48.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +com.google.errorprone:error_prone_annotations:2.48.0=spotbugs +com.google.errorprone:error_prone_annotations:2.50.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 @@ -92,32 +92,35 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked commons-io:commons-io:2.21.0=spotbugs commons-logging:commons-logging:1.2=compileClasspath,testCompileClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +dev.cel:common:0.13.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +dev.cel:protobuf:0.13.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +dev.cel:runtime:0.13.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-alts:1.44.1=testRuntimeClasspath -io.grpc:grpc-alts:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-alts:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-api:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-api:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-auth:1.44.1=testRuntimeClasspath -io.grpc:grpc-auth:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-auth:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-context:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-core:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.grpc:grpc-googleapis:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-googleapis:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-grpclb:1.44.1=testRuntimeClasspath -io.grpc:grpc-inprocess:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-inprocess:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-netty-shaded:1.44.1=testRuntimeClasspath -io.grpc:grpc-netty-shaded:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-netty-shaded:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.82.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.83.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-services:1.44.1=testRuntimeClasspath -io.grpc:grpc-services:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-services:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.44.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.grpc:grpc-stub:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.grpc:grpc-xds:1.44.1=testRuntimeClasspath -io.grpc:grpc-xds:1.82.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +io.grpc:grpc-xds:1.83.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.opencensus:opencensus-api:0.31.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -134,8 +137,8 @@ javax.annotation:javax.annotation-api:1.3.2=compileClasspath,latestDepForkedTest javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -189,7 +192,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -216,6 +218,7 @@ org.tabletest:tabletest-junit:1.2.2=latestDepForkedTestCompileClasspath,latestDe org.tabletest:tabletest-parser:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:gcloud:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.testcontainers:testcontainers:1.21.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.threeten:threeten-extra:1.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath org.threeten:threetenbp:1.5.2=compileClasspath,testCompileClasspath,testRuntimeClasspath org.threeten:threetenbp:1.7.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs diff --git a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java index 35f44420a64..6b73846ea34 100644 --- a/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java +++ b/dd-java-agent/instrumentation/google-pubsub-1.116/src/main/java/datadog/trace/instrumentation/googlepubsub/PublisherInstrumentation.java @@ -8,6 +8,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.JAVA_PUBSUB; import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.PRODUCER_DECORATE; import static datadog.trace.instrumentation.googlepubsub.PubSubDecorator.PUBSUB_PRODUCE; @@ -16,11 +17,11 @@ import com.google.cloud.pubsub.v1.Publisher; import com.google.pubsub.v1.PubsubMessage; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.api.datastreams.DataStreamsContext; import datadog.trace.api.datastreams.DataStreamsTags; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -42,7 +43,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class Wrap { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before(@Advice.This Publisher publisher) { + public static ContextScope before(@Advice.This Publisher publisher) { final AgentSpan span = startSpan(JAVA_PUBSUB.toString(), PUBSUB_PRODUCE); final CharSequence topicName = PRODUCER_DECORATE.extractTopic(publisher.getTopicNameString()); @@ -54,11 +55,11 @@ public static AgentScope before(@Advice.This Publisher publisher) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { PRODUCER_DECORATE.onError(scope, throwable); PRODUCER_DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } 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 cc508b1ff0c..530fd856a8e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=muzzleBootstrap,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=muzzleBootstrap,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -110,7 +110,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 ffc6252632e..4e2fc3c40d0 100644 --- a/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle-testing-5.1/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/gradle.lockfile b/dd-java-agent/instrumentation/gradle.lockfile index 39fe38fdcf2..6d3eb76a4b9 100644 --- a/dd-java-agent/instrumentation/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=runtimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -36,8 +36,8 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=runtimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -72,7 +72,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 449a49e1598..370c233b9f3 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-3.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 6262a1146d7..12f2b2ea8d4 100644 --- a/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/gradle/gradle-8.3/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 efd7712f615..b9d78f2d133 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 d1724a305b3..9abe6425a01 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=graphql20LatestDepForkedTestCompileClasspath, com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,graphql20LatestDepForkedTestAnnotationProcessor,graphql20LatestDepTestAnnotationProcessor,graphql21LatestDepForkedTestAnnotationProcessor,graphql21LatestDepTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql2 javax.servlet:javax.servlet-api:3.1.0=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=graphql20LatestDepForkedTestRunt org.junit.platform:junit-platform-suite-api:1.14.1=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=graphql20LatestDepForkedTestCompileClasspath,graphql20LatestDepForkedTestRuntimeClasspath,graphql20LatestDepTestCompileClasspath,graphql20LatestDepTestRuntimeClasspath,graphql21LatestDepForkedTestCompileClasspath,graphql21LatestDepForkedTestRuntimeClasspath,graphql21LatestDepTestCompileClasspath,graphql21LatestDepTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 21bc39313ac..d6a4bbbf0ca 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.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 d0f7df97ea2..0f81524596f 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/grizzly/grizzly-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -66,8 +66,8 @@ javax.xml.bind:jaxb-api:2.2.3=latestDepTestCompileClasspath,latestDepTestRuntime javax.xml.stream:stax-api:1.0-2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -144,7 +144,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 83181f373cf..b3327680954 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latest5DepTestCompileClasspath,latest5DepTest com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,8 +23,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest5DepTestAnnotationProcessor,latestDepTestAnnotationProcessor,muleLatestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeCl javax.servlet:javax.servlet-api:3.1.0=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latest5DepTestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latest5DepTestCompileClasspath,latest5DepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latest5DepTestRuntimeClasspath,latestDepTestRuntimeClasspath,muleLatestDepTestRuntimeClasspath,testRuntimeClasspath org.mule.glassfish.grizzly:connection-pool:2.3.36-MULE-028=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath org.mule.glassfish.grizzly:grizzly-framework:2.3.36-MULE-028=muleLatestDepTestCompileClasspath,muleLatestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java index 30b38dbfeb9..fd2da5eea0d 100644 --- a/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/grizzly/grizzly-client-1.9/src/main/java/datadog/trace/instrumentation/grizzly/client/AsyncHttpClientInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.grizzly.client.ClientDecorator.DECORATE; import static datadog.trace.instrumentation.grizzly.client.ClientDecorator.HTTP_REQUEST; import static datadog.trace.instrumentation.grizzly.client.InjectAdapter.SETTER; @@ -14,9 +15,9 @@ import com.ning.http.client.AsyncHandler; import com.ning.http.client.Request; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -42,7 +43,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ExecuteRequest { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Request request, @Advice.Argument(value = 1, readOnly = false) AsyncHandler handler) { AgentSpan parentSpan = activeSpan(); @@ -55,12 +56,12 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } if (throwable != null) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); 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 7af6e90f4bb..98a0378fddb 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -66,8 +66,8 @@ javax.xml.bind:jaxb-api:2.2.3=latestDepTestCompileClasspath,latestDepTestRuntime javax.xml.stream:stax-api:1.0-2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.mimepull:mimepull:1.9.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jvnet.mimepull:mimepull:1.9.5=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile index 2e29e9b84cf..0f038c65d14 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/grpc-1.5/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestCo com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,compileProtoPath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileProtoPath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.0.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -62,45 +62,45 @@ commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestCompileP commons-io:commons-io:2.21.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.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-api:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-context:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-context:1.83.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-context:1.84.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-core:1.42.2=compileClasspath,compileProtoPath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-core:1.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-inprocess:1.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-core:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-inprocess:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-netty:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-netty:1.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-netty:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf-lite:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf-lite:1.83.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf-lite:1.84.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-protobuf:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-protobuf:1.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-protobuf:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.grpc:grpc-stub:1.42.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.grpc:grpc-stub:1.83.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.grpc:grpc-util:1.83.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-stub:1.84.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.grpc:grpc-util:1.84.0=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.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-buffer:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.63.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-codec-socks:4.2.15.Final=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.16.Final=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath io.netty:netty-common:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-common:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.63.Final=testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.2.15.Final=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.2.16.Final=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-handler:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-resolver:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.63.Final=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -io.netty:netty-transport:4.2.15.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.perfmark:perfmark-api:0.23.0=compileProtoPath,testCompileProtoPath,testRuntimeClasspath io.perfmark:perfmark-api:0.27.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath @@ -108,8 +108,8 @@ javax.annotation:javax.annotation-api:1.3.2=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,compileProtoPath,latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -153,7 +153,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestCompileProtoPath,la org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestCompileProtoPath,latestDepTestRuntimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java index 6caaa52af1b..93628297d55 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/AbstractClientStreamInstrumentation.java @@ -6,9 +6,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.grpc.internal.ClientStreamListener; import net.bytebuddy.asm.Advice; @@ -35,7 +35,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class ActivateSpan { @Advice.OnMethodEnter - public static AgentScope before(@Advice.Argument(0) ClientStreamListener listener) { + public static ContextScope before(@Advice.Argument(0) ClientStreamListener listener) { AgentSpan span = InstrumentationContext.get(ClientStreamListener.class, AgentSpan.class).get(listener); if (null != span) { @@ -45,7 +45,7 @@ public static AgentScope before(@Advice.Argument(0) ClientStreamListener listene } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java index fcb8615aaa2..b9fd2143262 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientCallImplInstrumentation.java @@ -10,10 +10,10 @@ import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.grpc.ClientCall; import io.grpc.Grpc; @@ -67,7 +67,7 @@ public static void capture( public static final class Start { @Advice.OnMethodEnter - public static AgentScope before( + public static ContextScope before( @Advice.This ClientCall call, @Advice.Argument(1) Metadata headers, @Advice.Local("$$ddSpan") AgentSpan span) { @@ -80,7 +80,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class) public static void after( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Thrown Throwable error, @Advice.Local("$$ddSpan") AgentSpan span) throws Throwable { @@ -110,7 +110,7 @@ public static void before(@Advice.Argument(1) Metadata headers) { public static final class ActivateSpan { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); if (null != span) { return activateSpan(span); @@ -119,7 +119,7 @@ public static AgentScope before(@Advice.This ClientCall call) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } @@ -128,7 +128,7 @@ public static void after(@Advice.Enter AgentScope scope) { public static final class SendMessage { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientCall call) { + public static ContextScope before(@Advice.This ClientCall call) { // could create a message span here for the request AgentSpan span = InstrumentationContext.get(ClientCall.class, AgentSpan.class).get(call); if (span != null) { @@ -138,7 +138,7 @@ public static AgentScope before(@Advice.This ClientCall call) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java index 953a21be327..0c0f04cc812 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/ClientStreamListenerImplInstrumentation.java @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.grpc.Status; import io.grpc.internal.ClientStreamListener; @@ -68,7 +68,7 @@ public static void exceptionThrown( public static final class RecordActivity { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientStreamListener listener) { + public static ContextScope before(@Advice.This ClientStreamListener listener) { // activate the span so serialisation work is accounted for, whichever thread the work is done // on AgentSpan span = @@ -80,7 +80,7 @@ public static AgentScope before(@Advice.This ClientStreamListener listener) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } @@ -96,7 +96,7 @@ public static void after(@Advice.Enter AgentScope scope) { public static final class RecordHeaders { @Advice.OnMethodEnter - public static AgentScope before(@Advice.This ClientStreamListener listener) { + public static ContextScope before(@Advice.This ClientStreamListener listener) { // activate the span so serialisation work is accounted for, whichever thread the work is done // on AgentSpan span = @@ -108,7 +108,7 @@ public static AgentScope before(@Advice.This ClientStreamListener listener) { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); } diff --git a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java index e72ef5d5431..1d586a350a6 100644 --- a/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java +++ b/dd-java-agent/instrumentation/grpc-1.5/src/main/java/datadog/trace/instrumentation/grpc/client/MessagesAvailableInstrumentation.java @@ -5,17 +5,18 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.GRPC_MESSAGE; import static datadog.trace.instrumentation.grpc.client.GrpcClientDecorator.OPERATION_NAME; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.java.concurrent.AdviceUtils; import datadog.trace.bootstrap.instrumentation.java.concurrent.State; @@ -52,7 +53,7 @@ public static void capture(@Advice.This Runnable task) { public static final class ReceiveMessages { @Advice.OnMethodEnter - public static AgentScope before() { + public static ContextScope before() { AgentSpan clientSpan = activeSpan(); if (clientSpan != null && OPERATION_NAME.equals(clientSpan.getOperationName())) { AgentSpan messageSpan = @@ -65,10 +66,10 @@ public static AgentScope before() { } @Advice.OnMethodExit(onThrowable = Throwable.class) - public static void after(@Advice.Enter AgentScope scope) { + public static void after(@Advice.Enter ContextScope scope) { if (null != scope) { scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile index 8a1899e7d80..051ba722322 100644 --- a/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/gson-1.6/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile index 49c6abc720e..9dfaacbf2f0 100644 --- a/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/guava-10.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -60,8 +60,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/guidewire-10.0/gradle.lockfile b/dd-java-agent/instrumentation/guidewire-10.0/gradle.lockfile new file mode 100644 index 00000000000..9a91d704cb9 --- /dev/null +++ b/dd-java-agent/instrumentation/guidewire-10.0/gradle.lockfile @@ -0,0 +1,124 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +# To regenerate this file, run: ./gradlew :dd-java-agent:instrumentation:guidewire-10.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 +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.5=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.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.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.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.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.48.0=spotbugs +com.google.guava:failureaccess:1.0.1=annotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=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 +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.21.0=spotbugs +de.thetaphi:forbiddenapis:3.10=compileClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath +io.sqreen:libsqreen:17.5.0=testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath +jaxen:jaxen:2.0.6=spotbugs +junit:junit:4.13.2=testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs +org.apache.ant:ant-antlr:1.10.14=codenarc +org.apache.ant:ant-junit:1.10.14=codenarc +org.apache.bcel:bcel:6.12.0=spotbugs +org.apache.commons:commons-lang3:3.20.0=spotbugs +org.apache.commons:commons-text:1.15.0=spotbugs +org.apache.logging.log4j:log4j-api:2.26.1=spotbugs +org.apache.logging.log4j:log4j-core:2.26.1=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.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.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 +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.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.10.1=spotbugs +org.ow2.asm:asm-analysis:9.7.1=testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=spotbugs,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=spotbugs,testRuntimeClasspath +org.ow2.asm:asm-util:9.10.1=spotbugs +org.ow2.asm:asm-util:9.7.1=testRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,spotbugs,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=spotbugsSlf4j +org.slf4j:slf4j-api:2.0.18=spotbugs +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.2=testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=testCompileClasspath,testRuntimeClasspath +org.xmlresolver:xmlresolver:5.3.3=spotbugs +empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java b/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java index 6fd1e1a1d46..9874de89c3d 100644 --- a/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/guidewire-10.0/src/main/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentation.java @@ -51,11 +51,6 @@ public WsiAsyncResponseInstrumentation() { super("guidewire"); } - @Override - protected boolean defaultEnabled() { - return false; - } - @Override public String hierarchyMarkerType() { return ASYNC_RESPONSE; diff --git a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java index 0e222537c90..e8534b5c3b5 100644 --- a/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java +++ b/dd-java-agent/instrumentation/guidewire-10.0/src/test/java/datadog/trace/instrumentation/guidewire/WsiAsyncResponseInstrumentationTest.java @@ -9,12 +9,11 @@ import datadog.context.ContextScope; import datadog.trace.agent.test.AbstractInstrumentationTest; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -import datadog.trace.test.junit.utils.config.WithConfig; import gw.internal.xml.ws.AsyncResponseImpl; import gw.internal.xml.ws.UnrelatedWorker; +import java.util.concurrent.atomic.AtomicReference; import org.junit.jupiter.api.Test; -@WithConfig(key = "integration.guidewire.enabled", value = "true") class WsiAsyncResponseInstrumentationTest extends AbstractInstrumentationTest { @FunctionalInterface @@ -98,13 +97,18 @@ void noContextLeakToSubsequentInvocation() throws Exception { } @Test - void workerConstructedButNeverRunDoesNotCorruptLaterTraces() throws Exception { - // Constructed under an active span but never run: capture happens but is never activated. - // Guards that the stranded continuation does not mis-attribute a later, unrelated trace. - runUnderTrace("outer", () -> new AsyncResponseImpl()); + void delayedWorkerDoesNotCorruptInterveningTrace() throws Exception { + AtomicReference response = new AtomicReference<>(); + + runUnderTrace("outer", () -> response.set(new AsyncResponseImpl())); runUnderTrace("independent", () -> {}); + response.get().invokeSync(); - // 'independent' is a clean, standalone root regardless of the stranded continuation. - assertTraces(trace(span().root().operationName("independent"))); + assertTraces( + trace( + SORT_BY_START_TIME, + span().root().operationName("outer"), + span().childOfPrevious().operationName("soap.call")), + trace(span().root().operationName("independent"))); } } 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 c0880ed9ff8..326475a62ec 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java index 9e17358c1ac..c240d2147d7 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.6/src/main/java/datadog/trace/instrumentation/hazelcast36/DistributedObjectInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hazelcast36.DistributedObjectDecorator.DECORATE; import static datadog.trace.instrumentation.hazelcast36.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast36.HazelcastConstants.SPAN_NAME; @@ -15,10 +16,10 @@ import com.hazelcast.core.DistributedObject; import com.hazelcast.core.ICompletableFuture; import com.hazelcast.spi.discovery.DiscoveryStrategy; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -186,7 +187,7 @@ public static class SyncAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level Hazelcast method; except in the @@ -208,13 +209,13 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); @@ -242,7 +243,7 @@ public static class CompletableFutureAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final DistributedObject that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level Hazelcast method; except in the @@ -264,7 +265,7 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final ICompletableFuture future) { if (scope == null) { @@ -272,7 +273,7 @@ public static void methodExit( } // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. 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 64c87a89bbf..1e32065c934 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java index 071003b4e22..8de87678326 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-3.9/src/main/java/datadog/trace/instrumentation/hazelcast39/ClientInvocationInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hazelcast39.ClientInvocationDecorator.DECORATE; import static datadog.trace.instrumentation.hazelcast39.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast39.HazelcastConstants.SPAN_NAME; @@ -17,10 +18,10 @@ import com.hazelcast.client.spi.impl.ClientInvocationFuture; import com.hazelcast.client.spi.impl.NonSmartClientInvocationService; import com.hazelcast.core.HazelcastInstance; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -52,7 +53,7 @@ public static class InvocationAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final ClientInvocation that, @Advice.FieldValue("objectName") final String objectName, @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) { @@ -82,7 +83,7 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) { if (scope == null) { @@ -90,7 +91,7 @@ public static void methodExit( } // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. 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 98c7ecac12e..12c9781e018 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java index e325b1ff49e..755b4c2accd 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/ClientListenerInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.SPAN_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastDecorator.DECORATE; @@ -13,9 +14,9 @@ import com.hazelcast.client.impl.protocol.ClientMessage; import com.hazelcast.client.impl.proxy.ClientMapProxy; import com.hazelcast.client.impl.spi.ClientListenerService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -41,7 +42,7 @@ public static class ListenerAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final ClientListenerService that, @Advice.Argument(0) final ClientMessage clientMessage) { @@ -70,13 +71,13 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); diff --git a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java index 014d2af5a5c..d7e7420436f 100644 --- a/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java +++ b/dd-java-agent/instrumentation/hazelcast/hazelcast-4.0/src/main/java/datadog/trace/instrumentation/hazelcast4/InvocationAdvice.java @@ -2,6 +2,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hazelcast4.HazelcastConstants.COMPONENT_NAME; import static datadog.trace.instrumentation.hazelcast4.HazelcastDecorator.DECORATE; @@ -9,9 +10,9 @@ import com.hazelcast.client.impl.proxy.ClientMapProxy; import com.hazelcast.client.impl.spi.impl.ClientInvocation; import com.hazelcast.client.impl.spi.impl.ClientInvocationFuture; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -20,7 +21,7 @@ public class InvocationAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final ClientInvocation that, @Advice.FieldValue("objectName") final Object objectName, @Advice.FieldValue("clientMessage") final ClientMessage clientMessage) { @@ -51,7 +52,7 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.FieldValue("clientInvocationFuture") final ClientInvocationFuture future) { if (scope == null) { @@ -59,7 +60,7 @@ public static void methodExit( } // If we have a scope (i.e. we were the top-level Hazelcast SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile index 8fc33467b16..2c0bdac8de2 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 3f7fdd6bdff..e76bdba737e 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 @@ -2,11 +2,12 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.ContextStore; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Arrays; import java.util.HashSet; @@ -39,7 +40,7 @@ public static SessionState startScopeFrom( return null; // This method call is being traced already. } - final AgentScope scope; + final ContextScope scope; if (createSpan) { final AgentSpan span = startSpan("java-hibernate", operationName, sessionState.getSessionSpan().spanContext()); @@ -62,7 +63,7 @@ public static void closeScope( final Object entity, final boolean closeSpan) { - final AgentScope scope = sessionState == null ? null : sessionState.getMethodScope(); + final ContextScope scope = sessionState == null ? null : sessionState.getMethodScope(); if (scope == null) { // This method call was re-entrant. Do nothing, since it is being traced by the parent/first // call. @@ -71,7 +72,7 @@ public static void closeScope( CallDepthThreadLocalMap.reset(SessionMethodUtils.class); sessionState.setMethodScope(null); - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (span != null && (sessionState.hasChildSpan() || closeSpan)) { DECORATOR.onError(span, throwable); if (entity != null) { diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java index 694c8f1958f..ecbb2447706 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-common/src/main/java/datadog/trace/instrumentation/hibernate/SessionState.java @@ -1,12 +1,12 @@ package datadog.trace.instrumentation.hibernate; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; public class SessionState { private final AgentSpan sessionSpan; - private AgentScope methodScope; + private ContextScope methodScope; private boolean hasChildSpan = true; public SessionState(AgentSpan sessionSpan) { @@ -17,11 +17,11 @@ public AgentSpan getSessionSpan() { return sessionSpan; } - public AgentScope getMethodScope() { + public ContextScope getMethodScope() { return methodScope; } - public void setMethodScope(AgentScope methodScope) { + public void setMethodScope(ContextScope methodScope) { this.methodScope = methodScope; } 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 d982dd49203..39dd2e59978 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -65,8 +65,8 @@ javax.transaction:jta:1.1=compileClasspath,latestDepTestCompileClasspath,latestD javax.xml.bind:jaxb-api:2.2.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -115,7 +115,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java index bf2f95f6153..42f57f9fd27 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/main/java/datadog/trace/instrumentation/hibernate/core/v3_3/QueryInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -61,7 +62,7 @@ public static SessionState startMethod( final SessionState state = SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true); if (state != null) { - DECORATOR.onStatement(state.getMethodScope().span(), query.getQueryString()); + DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString()); } return state; } diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy index 659e24b9552..042e150e3c0 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-3.3/src/test/groovy/SessionTest.groovy @@ -1,5 +1,5 @@ import datadog.trace.api.DDSpanTypes -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.bootstrap.instrumentation.api.Tags import org.hibernate.LockMode import org.hibernate.MappingException @@ -9,6 +9,7 @@ import org.hibernate.Session import spock.lang.Shared import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan class SessionTest extends AbstractHibernateTest { @@ -540,7 +541,7 @@ class SessionTest extends AbstractHibernateTest { def "test hibernate overlapping Sessions"() { - AgentScope scope = activateSpan(startSpan("test", "overlapping Sessions")) + ContextScope scope = activateSpan(startSpan("test", "overlapping Sessions")) def session1 = sessionFactory.openSession() session1.beginTransaction() @@ -559,7 +560,7 @@ class SessionTest extends AbstractHibernateTest { session3.close() scope.close() - scope.span().finish() + spanFromScope(scope).finish() expect: 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 07d68b9351a..5a65d410238 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -24,8 +24,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -65,8 +65,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.xml.bind:jaxb-api:2.2.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -118,7 +118,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java index 8ab199d3552..c37929908cc 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/main/java/datadog/trace/instrumentation/hibernate/core/v4_0/QueryInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.implementsInterface; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.hibernate.HibernateDecorator.DECORATOR; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -62,7 +63,7 @@ public static SessionState startMethod( final SessionState state = SessionMethodUtils.startScopeFrom(contextStore, query, operationName, null, true); if (state != null) { - DECORATOR.onStatement(state.getMethodScope().span(), query.getQueryString()); + DECORATOR.onStatement(spanFromScope(state.getMethodScope()), query.getQueryString()); } return state; } diff --git a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy index 9fb814fd8f4..d1f39daa76c 100644 --- a/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy +++ b/dd-java-agent/instrumentation/hibernate/hibernate-core-4.0/src/test/groovy/SessionTest.groovy @@ -1,5 +1,5 @@ import datadog.trace.api.DDSpanTypes -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.bootstrap.instrumentation.api.Tags import org.hibernate.LockMode import org.hibernate.MappingException @@ -9,6 +9,7 @@ import org.hibernate.Session import spock.lang.Shared import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan class SessionTest extends AbstractHibernateTest { @@ -466,7 +467,7 @@ class SessionTest extends AbstractHibernateTest { def "test hibernate overlapping Sessions"() { setup: - AgentScope scope = activateSpan(startSpan("test", "overlapping Sessions")) + ContextScope scope = activateSpan(startSpan("test", "overlapping Sessions")) def session1 = sessionFactory.openSession() session1.beginTransaction() @@ -485,7 +486,7 @@ class SessionTest extends AbstractHibernateTest { session3.close() scope.close() - scope.span().finish() + spanFromScope(scope).finish() expect: assertTraces(1) { 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 a062c0d275f..9b0dcacca7d 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -24,8 +24,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -113,7 +113,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile index 43dc65aec24..0957a73b472 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/hystrix-1.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -106,7 +106,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy index 5e518cf072f..22f93d3c649 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableChainTest.groovy @@ -9,12 +9,6 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class HystrixObservableChainTest extends HystrixTestRunner { - @Override - boolean useStrictTraceWrites() { - // FIXME - test still times out in CI - return false - } - def "test command #action"() { setup: diff --git a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy index d35c15ea269..ef24b26fc05 100644 --- a/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy +++ b/dd-java-agent/instrumentation/hystrix-1.4/src/test/groovy/HystrixObservableTest.groovy @@ -3,8 +3,8 @@ import com.netflix.hystrix.HystrixObservableCommand import com.netflix.hystrix.exception.HystrixRuntimeException import datadog.trace.api.Trace import datadog.trace.bootstrap.instrumentation.api.Tags -import datadog.trace.test.util.Flaky import rx.Observable +import rx.Scheduler import rx.schedulers.Schedulers import java.util.concurrent.BlockingQueue @@ -15,10 +15,13 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace class HystrixObservableTest extends HystrixTestRunner { - @Override - boolean useStrictTraceWrites() { - // FIXME - test still times out in CI - return false + private Observable observeErrorOn(Observable source, Scheduler scheduler) { + if (isLatestDepTest) { + return source.observeOn(scheduler) + } + // RxJava 1.0.7 can spin after draining an error. Carry it as a value across the + // scheduler, then restore it for Hystrix; latest-dependency tests cover the direct path. + return source.materialize().observeOn(scheduler).dematerialize() } def "test command #action"() { @@ -143,7 +146,7 @@ class HystrixObservableTest extends HystrixTestRunner { Observable.error(new IllegalArgumentException()).repeat(1) } if (observeOnFn) { - err = err.observeOn(observeOnFn) + err = observeErrorOn(err, observeOnFn) } if (subscribeOnFn) { err = err.subscribeOn(subscribeOnFn) @@ -242,7 +245,6 @@ class HystrixObservableTest extends HystrixTestRunner { } } - @Flaky("https://github.com/DataDog/dd-trace-java/issues/7725") def "test no fallback results in error for #action"() { setup: def observeOnFn = observeOn @@ -259,7 +261,7 @@ class HystrixObservableTest extends HystrixTestRunner { Observable.error(new IllegalArgumentException()) } if (observeOnFn) { - err = err.observeOn(observeOnFn) + err = observeErrorOn(err, observeOnFn) } if (subscribeOnFn) { err = err.subscribeOn(subscribeOnFn) diff --git a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile index 925dfa4c8f8..d19366f1148 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/ignite-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=ignite216ForkedTestCompileClasspath,ignite216 com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,ignite216ForkedTestAnnotationProcessor,ignite216TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ javax.cache:cache-api:1.0.0=compileClasspath,ignite216ForkedTestCompileClasspath javax.servlet:javax.servlet-api:3.1.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -122,7 +122,6 @@ org.junit.platform:junit-platform-runner:1.14.1=ignite216ForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=ignite216ForkedTestRuntimeClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=ignite216ForkedTestCompileClasspath,ignite216ForkedTestRuntimeClasspath,ignite216TestCompileClasspath,ignite216TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java index efdad2f73bc..6af960820a1 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheAsyncInstrumentation.java @@ -3,13 +3,14 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.ignite.v2.cache.IgniteCacheDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; 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 org.apache.ignite.Ignite; @@ -60,7 +61,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class IgniteAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level cache method final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class); @@ -81,7 +82,7 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final IgniteFuture future) { @@ -89,7 +90,7 @@ public static void stopSpan( return; } // If we have a scope (i.e. we were the top-level Ignite SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. @@ -111,7 +112,7 @@ public static void stopSpan( public static class KeyedAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName, @Advice.Argument(value = 0, optional = true) final Object key) { @@ -134,14 +135,14 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final IgniteFuture future) { if (scope == null) { return; } // If we have a scope (i.e. we were the top-level Ignite SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. diff --git a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java index c97b0d66fa6..29ba55521da 100644 --- a/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/ignite-2.0/src/main/java/datadog/trace/instrumentation/ignite/v2/cache/IgniteCacheSyncInstrumentation.java @@ -4,14 +4,15 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.ignite.v2.cache.IgniteCacheDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; 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 org.apache.ignite.Ignite; @@ -73,7 +74,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class IgniteAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level cache method final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(IgniteCache.class); @@ -92,13 +93,13 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); @@ -110,7 +111,7 @@ public static void stopSpan( public static class KeyedAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName, @Advice.Argument(value = 0, optional = true) final Object key) { @@ -131,15 +132,16 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count } } @@ -147,7 +149,7 @@ public static void stopSpan( public static class QueryAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final IgniteCache that, @Advice.Origin("#m") final String methodName, @Advice.Argument(0) final Query query) { @@ -168,15 +170,16 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); CallDepthThreadLocalMap.reset(IgniteCache.class); // reset call depth count } } 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 3a0c2f3f3e1..82911b80c90 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 6100d7ec0ee..720082eaedb 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -28,8 +28,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 51b134f9e8f..6412b1de3ea 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 812c2f040d0..8fe303fe805 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 a8202b363e2..a14bdcea5f5 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -28,8 +28,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 08ccb4413e0..812c1da5971 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -28,8 +28,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 9326c337ee0..1b87f5bb3f7 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 db526928922..e2ffc4496b4 100644 --- a/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/jacoco-0.8.9/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f310f59d958..3a539df4325 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 072ba031a8d..82578773d74 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 @@ -10,6 +10,8 @@ import static datadog.trace.instrumentation.java.concurrent.ConcurrentInstrumentationNames.EXECUTOR_INSTRUMENTATION_NAME; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; import static net.bytebuddy.matcher.ElementMatchers.isTypeInitializer; +import static net.bytebuddy.matcher.ElementMatchers.returns; +import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; import com.google.auto.service.AutoService; @@ -59,8 +61,12 @@ public AsyncPropagatingDisableInstrumentation() { private static final ElementMatcher NETTY_GLOBAL_EVENT_EXECUTOR = namedOneOf( "io.netty.util.concurrent.GlobalEventExecutor", - // shaded version - "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor"); + "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor", + "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor"); + private static final ElementMatcher NETTY_IDLE_STATE_HANDLER = + namedOneOf( + "io.netty.handler.timeout.IdleStateHandler", + "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler"); private static final ElementMatcher JAVA_HTTP_CLIENT = extendsClass(named("java.net.http.HttpClient")); private static final String LETTUCE_HANDSHAKE_HANDLER = @@ -108,6 +114,9 @@ public String[] knownMatchingTypes() { LETTUCE_HANDSHAKE_HANDLER, "io.netty.util.concurrent.GlobalEventExecutor", "io.grpc.netty.shaded.io.netty.util.concurrent.GlobalEventExecutor", + "com.couchbase.client.deps.io.netty.util.concurrent.GlobalEventExecutor", + "io.netty.handler.timeout.IdleStateHandler", + "io.grpc.netty.shaded.io.netty.handler.timeout.IdleStateHandler", "com.linecorp.armeria.client.HttpClientFactory", "com.linecorp.armeria.client.HttpChannelPool" }; @@ -220,6 +229,17 @@ public void methodAdvice(MethodTransformer transformer) { isTypeInitializer().and(isDeclaredBy(RXJAVA3_DISABLED_TYPE_INITIALIZERS)), advice); transformer.applyAdvice( isTypeInitializer().and(isDeclaredBy(NETTY_GLOBAL_EVENT_EXECUTOR)), advice); + transformer.applyAdvice( + named("initialize") + .and(returns(void.class)) + .and( + takesArgument( + 0, + namedOneOf( + "io.netty.channel.ChannelHandlerContext", + "io.grpc.netty.shaded.io.netty.channel.ChannelHandlerContext"))) + .and(isDeclaredBy(NETTY_IDLE_STATE_HANDLER)), + advice); transformer.applyAdvice(namedOneOf("sendAsync").and(isDeclaredBy(JAVA_HTTP_CLIENT)), advice); transformer.applyAdvice( named("channelRegistered").and(isDeclaredBy(named(LETTUCE_HANDSHAKE_HANDLER))), advice); diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java index b7340c0f434..186b86ea9b3 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/main/java/datadog/trace/instrumentation/java/concurrent/executor/ThreadPoolExecutorInstrumentation.java @@ -62,7 +62,9 @@ public final class ThreadPoolExecutorInstrumentation private static final ElementMatcher NO_WRAPPING_BEFORE_DELEGATION = not( isDeclaredBy( - namedOneOf("org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor"))); + namedOneOf( + "org.elasticsearch.common.util.concurrent.EsThreadPoolExecutor", + "org.opensearch.common.util.concurrent.OpenSearchThreadPoolExecutor"))); @Override public String hierarchyMarkerType() { @@ -111,7 +113,7 @@ public static void capture( // queue time needs to be handled separately because there are RunnableFutures which are // excluded as // Runnables but it is not until now that they will be put on the executor's queue - if (!exclude(EXECUTOR, tpe)) { + if (QueueTimerHelper.isReady() && !exclude(EXECUTOR, tpe)) { if (!exclude(RUNNABLE, task)) { Queue queue = tpe.getQueue(); QueueTimerHelper.startQueuingTimer( diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/QueueTimingReadinessForkedTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/QueueTimingReadinessForkedTest.groovy new file mode 100644 index 00000000000..b0f0e9bd8df --- /dev/null +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/QueueTimingReadinessForkedTest.groovy @@ -0,0 +1,113 @@ +import datadog.trace.agent.test.InstrumentationSpecification +import datadog.trace.bootstrap.instrumentation.api.AgentTracer +import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling + +import java.util.concurrent.CountDownLatch +import java.util.concurrent.LinkedBlockingQueue +import java.util.concurrent.ThreadPoolExecutor +import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger + +import static datadog.trace.agent.test.utils.TraceUtils.basicSpan +import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace + +class QueueTimingReadinessForkedTest extends InstrumentationSpecification { + @Override + protected void configurePreAgent() { + injectSysConfig("dd.profiling.enabled", "true") + injectSysConfig("dd.profiling.queueing.time.enabled", "true") + super.configurePreAgent() + } + + def "queue metadata is read only after JFR is ready while tracing always propagates"() { + setup: + def queue = new CountingQueue() + def executor = new ThreadPoolExecutor(1, 1, 0, TimeUnit.SECONDS, queue) + assert !InstrumentationBasedProfiling.isJFRReady() + + when: + runTasks(executor, "before") + + then: + queue.sizeCalls.get() == 0 + TEST_PROFILING_CONTEXT_INTEGRATION.closedTimings.isEmpty() + assertTraces(2) { + trace(1) { + basicSpan(it, "execute-before") + } + trace(1) { + basicSpan(it, "submit-before") + } + } + + when: + TEST_WRITER.clear() + InstrumentationBasedProfiling.enableInstrumentationBasedProfiling() + runTasks(executor, "after") + + then: + queue.sizeCalls.get() == 2 + assertTraces(2) { + trace(1) { + basicSpan(it, "execute-after") + } + trace(1) { + basicSpan(it, "submit-after") + } + } + TEST_PROFILING_CONTEXT_INTEGRATION.isBalanced() + TEST_PROFILING_CONTEXT_INTEGRATION.closedTimings.size() == 2 + TEST_PROFILING_CONTEXT_INTEGRATION.closedTimings.every { + it.queue == CountingQueue && it.scheduler == ThreadPoolExecutor && it.queueLength >= 0 + } + + cleanup: + executor.shutdownNow() + assert executor.awaitTermination(5, TimeUnit.SECONDS) + TEST_PROFILING_CONTEXT_INTEGRATION.closedTimings.clear() + } + + private static void runTasks(ThreadPoolExecutor executor, String phase) { + runUnderTrace("execute-" + phase) { + def expectedSpanId = AgentTracer.activeSpan().spanId + def task = new ContextCheckingTask() + executor.execute(task) + assert task.done.await(5, TimeUnit.SECONDS) + assert task.spanId == expectedSpanId + } + runUnderTrace("submit-" + phase) { + def expectedSpanId = AgentTracer.activeSpan().spanId + def task = new ContextCheckingTask() + executor.submit(task).get(5, TimeUnit.SECONDS) + assert task.spanId == expectedSpanId + } + } + + static class ContextCheckingTask implements Runnable { + final CountDownLatch done = new CountDownLatch(1) + volatile long spanId + + @Override + void run() { + def span = AgentTracer.activeSpan() + spanId = span == null ? 0 : span.spanId + done.countDown() + } + } + + static class CountingQueue extends LinkedBlockingQueue { + final AtomicInteger sizeCalls = new AtomicInteger() + + @Override + int size() { + sizeCalls.incrementAndGet() + return super.size() + } + + @Override + boolean isEmpty() { + // Executor housekeeping must not count as a queue-timing metadata read. + return super.size() == 0 + } + } +} diff --git a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy index 0ce840a5600..9545dd9ac61 100644 --- a/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy +++ b/dd-java-agent/instrumentation/java/java-concurrent/java-concurrent-1.8/src/test/groovy/timer/TimerTaskContinuationTest.groovy @@ -6,7 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSp import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan import datadog.trace.agent.test.InstrumentationSpecification -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.bootstrap.instrumentation.api.AgentSpan import spock.lang.Shared @@ -32,7 +32,7 @@ class TimerTaskContinuationTest extends InstrumentationSpecification { @Override void run() { AgentSpan span = startSpan("test", "child") - AgentScope scope = activateSpan(span) + ContextScope scope = activateSpan(span) try { span.finish() } finally { 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 ecd5971f79e..6cc4ed2a98e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=previewTestCompileClasspath,testCompileClassp com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=previewTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=previewTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,previewTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=previewTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=previewTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,previewTestCompileClasspath,previewTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=previewTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=previewTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=previewTestRuntimeClasspath,test org.junit.platform:junit-platform-suite-api:1.14.1=previewTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=previewTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=previewTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=previewTestCompileClasspath,previewTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 820d24e3ea6..ef94168b6a3 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 1ffb9c7a7ef..e1fb50049dd 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=java11TestCompileClasspath,java11TestRuntimeC com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,java11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=java11TestRuntimeClasspath,latestDepTestRuntimeClassp javax.servlet:javax.servlet-api:3.1.0=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=java11TestRuntimeClasspath,lates org.junit.platform:junit-platform-suite-api:1.14.1=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=java11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=java11TestCompileClasspath,java11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 16223f2ee15..185f334019f 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-inline:4.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=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 9462a2d67a1..c66d06d3089 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 b44dfa13ac2..8bd33a3b453 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -23,8 +23,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0f087d63917..73fbc508c10 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 3d754b55639..7a01bbdb1d2 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 ac9d50900be..f386b35091c 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java25CompileClasspath,main_java25RuntimeClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 e7507960445..4455c50e053 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e99d544e01f..5089d12fca8 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=classloadingJbossTestCompileClasspath,classlo com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,classloadingJbossTestAnnotationProcessor,classloadingJsr14TestAnnotationProcessor,classloadingOsgiTestAnnotationProcessor,classloadingTomcatLatestDepTestAnnotationProcessor,classloadingTomcatTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=classloadingJbossTestRuntimeClasspath,classloadingJsr javax.servlet:javax.servlet-api:3.1.0=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -68,28 +68,28 @@ org.apache.commons:commons-text:1.15.0=spotbugs org.apache.felix:org.apache.felix.framework:6.0.2=classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apache.tomcat:tomcat-annotations-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-catalina:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-catalina:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-catalina:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-coyote:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-coyote:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-coyote:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-el-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-el-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-el-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-jaspic-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-jni:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jaspic-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jni:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-jni:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-jsp-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-jsp-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-jsp-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-juli:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-juli:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-juli:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-servlet-api:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-servlet-api:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-servlet-api:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-util-scan:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-util-scan:11.0.26=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath org.apache.tomcat:tomcat-util-scan:8.0.14=classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath -org.apache.tomcat:tomcat-util:11.0.25=classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-util:11.0.26=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 @@ -124,7 +124,6 @@ org.junit.platform:junit-platform-runner:1.14.1=classloadingJbossTestRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=classloadingJbossTestRuntimeClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=classloadingJbossTestCompileClasspath,classloadingJbossTestRuntimeClasspath,classloadingJsr14TestCompileClasspath,classloadingJsr14TestRuntimeClasspath,classloadingOsgiTestCompileClasspath,classloadingOsgiTestRuntimeClasspath,classloadingTomcatLatestDepTestCompileClasspath,classloadingTomcatLatestDepTestRuntimeClasspath,classloadingTomcatTestCompileClasspath,classloadingTomcatTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 518d5678a7d..c4efc68eb70 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 1a5b7b0f35b..fae47b1afd3 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java index e30648f61fa..e0a995378de 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java/datadog/trace/instrumentation/httpclient/HttpClientInstrumentation.java @@ -55,6 +55,7 @@ public String[] helperClassNames() { return new String[] { packageName + ".BodyHandlerWrapper", packageName + ".BodyHandlerWrapper$BodySubscriberWrapper", + packageName + ".BodyHandlerWrapper$SubscriptionWrapper", packageName + ".CompletableFutureWrapper", packageName + ".JavaNetClientDecorator", packageName + ".ResponseConsumer" 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 3a8c7fa70fc..2aa22ccde00 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 @@ -10,6 +10,7 @@ import java.util.List; import java.util.concurrent.CompletionStage; import java.util.concurrent.Flow; +import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; public class BodyHandlerWrapper implements BodyHandler { private final BodyHandler delegate; @@ -27,12 +28,17 @@ public BodySubscriber apply(ResponseInfo responseInfo) { if (subscriber instanceof BodySubscriberWrapper) { return subscriber; } - return new BodySubscriberWrapper<>(subscriber, span.captureWithContext()); + return new BodySubscriberWrapper<>(subscriber, span.captureWithContext().hold()); } static class BodySubscriberWrapper implements BodySubscriber { + private static final AtomicReferenceFieldUpdater + CONTINUATION = + AtomicReferenceFieldUpdater.newUpdater( + BodySubscriberWrapper.class, ContextContinuation.class, "continuation"); + private final BodySubscriber delegate; - private final ContextContinuation continuation; + private volatile ContextContinuation continuation; public BodySubscriberWrapper(BodySubscriber delegate, ContextContinuation continuation) { this.delegate = delegate; @@ -50,27 +56,87 @@ public CompletionStage getBody() { @Override public void onSubscribe(Flow.Subscription subscription) { - delegate.onSubscribe(subscription); + boolean completed = false; + try { + delegate.onSubscribe(new SubscriptionWrapper(subscription, this)); + completed = true; + } finally { + if (!completed) { + releaseContinuation(); + } + } } @Override public void onNext(List item) { - try (ContextScope ignore = continuation.resume()) { - delegate.onNext(item); + boolean completed = false; + try { + try (ContextScope ignore = resumeContinuation()) { + delegate.onNext(item); + } + completed = true; + } finally { + if (!completed) { + releaseContinuation(); + } } } @Override public void onError(Throwable throwable) { - try (ContextScope ignore = continuation.resume()) { - delegate.onError(throwable); + try { + try (ContextScope ignore = resumeContinuation()) { + delegate.onError(throwable); + } + } finally { + releaseContinuation(); } } @Override public void onComplete() { - try (ContextScope ignore = continuation.resume()) { - delegate.onComplete(); + try { + try (ContextScope ignore = resumeContinuation()) { + delegate.onComplete(); + } + } finally { + releaseContinuation(); + } + } + + private ContextScope resumeContinuation() { + ContextContinuation continuation = this.continuation; + return continuation == null ? null : continuation.resume(); + } + + private void releaseContinuation() { + ContextContinuation continuation = CONTINUATION.getAndSet(this, null); + if (continuation != null) { + continuation.release(); + } + } + } + + static final class SubscriptionWrapper implements Flow.Subscription { + private final Flow.Subscription delegate; + private final BodySubscriberWrapper subscriber; + + SubscriptionWrapper(Flow.Subscription delegate, BodySubscriberWrapper subscriber) { + this.delegate = delegate; + this.subscriber = subscriber; + } + + @Override + public void request(long count) { + delegate.request(count); + } + + @Override + public void cancel() { + try { + delegate.cancel(); + } finally { + subscriber.releaseContinuation(); } } } diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java index 8f4c09bb4f3..389d0a9ff6f 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAdvice.java @@ -2,13 +2,14 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.DECORATE; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.INSTRUMENTATION_NAME; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.OPERATION_NAME; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.http.HttpClient; import java.net.http.HttpRequest; @@ -17,7 +18,8 @@ public class SendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpRequest httpRequest) { + public static ContextScope methodEnter( + @Advice.Argument(value = 0) final HttpRequest httpRequest) { try { if (DECORATE.isAgentRequest(httpRequest)) { return null; @@ -32,7 +34,7 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque } DECORATE.allowContextInjection(); final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onRequest(span, httpRequest); @@ -49,7 +51,7 @@ public static AgentScope methodEnter(@Advice.Argument(value = 0) final HttpReque @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final HttpResponse httpResponse, @Advice.Thrown final Throwable throwable) { if (scope == null) { @@ -58,7 +60,7 @@ public static void methodExit( CallDepthThreadLocalMap.reset(HttpClient.class); DECORATE.blockContextInjection(); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != throwable) { DECORATE.onError(span, throwable); } else { diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java index a73c4c15722..f9838510417 100644 --- a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/main/java11/datadog/trace/instrumentation/httpclient/SendAsyncAdvice.java @@ -2,13 +2,14 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.DECORATE; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.INSTRUMENTATION_NAME; import static datadog.trace.instrumentation.httpclient.JavaNetClientDecorator.OPERATION_NAME; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.net.http.HttpClient; import java.net.http.HttpRequest; @@ -18,7 +19,7 @@ public class SendAsyncAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(value = 0) final HttpRequest httpRequest, @Advice.Argument(value = 1, readOnly = false) HttpResponse.BodyHandler bodyHandler) { try { @@ -35,7 +36,7 @@ public static AgentScope methodEnter( } DECORATE.allowContextInjection(); final AgentSpan span = startSpan(INSTRUMENTATION_NAME, OPERATION_NAME); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); if (bodyHandler != null) { // Pass span directly — BodyHandlerWrapper captures the continuation lazily in apply(), // only once response headers arrive. This avoids leaking a continuation when the @@ -58,7 +59,7 @@ public static AgentScope methodEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Argument(value = 0) final HttpRequest httpRequest, @Advice.Return(readOnly = false) CompletableFuture> future, @Advice.Thrown final Throwable throwable) { @@ -69,7 +70,7 @@ public static void methodExit( CallDepthThreadLocalMap.reset(HttpClient.class); DECORATE.blockContextInjection(); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java new file mode 100644 index 00000000000..ddb930c85f6 --- /dev/null +++ b/dd-java-agent/instrumentation/java/java-net/java-net-11.0/src/test/java/datadog/trace/instrumentation/httpclient/BodyHandlerWrapperTest.java @@ -0,0 +1,190 @@ +package datadog.trace.instrumentation.httpclient; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; + +import datadog.context.Context; +import datadog.context.ContextContinuation; +import datadog.context.ContextKey; +import datadog.context.ContextScope; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import java.lang.reflect.Proxy; +import java.net.http.HttpResponse.BodySubscriber; +import java.nio.ByteBuffer; +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.CompletableFuture; +import java.util.concurrent.CompletionStage; +import java.util.concurrent.Flow; +import org.junit.jupiter.api.Test; + +class BodyHandlerWrapperTest { + + @Test + void holdsContextAcrossCallbacksUntilCompletion() { + Context original = Context.current(); + Context captured = original.with(ContextKey.named("response-body"), new Object()); + ContextContinuation continuation = captured.capture(); + RecordingSubscriber subscriber = new RecordingSubscriber(); + BodySubscriber wrapper = wrap(subscriber, continuation); + + try { + wrapper.onNext(List.of()); + assertSame(captured, subscriber.callbackContexts.get(0)); + assertSame(original, Context.current()); + + wrapper.onNext(List.of()); + assertSame(captured, subscriber.callbackContexts.get(1)); + assertSame(original, Context.current()); + + wrapper.onComplete(); + assertSame(captured, subscriber.callbackContexts.get(2)); + assertSame(original, Context.current()); + + // A released continuation must no longer reactivate the captured context. + try (ContextScope ignored = continuation.resume()) { + assertSame(original, Context.current()); + } + } finally { + continuation.release(); + } + } + + @Test + void releasesContinuationWhenOnSubscribeThrows() { + RecordingContinuation continuation = new RecordingContinuation(); + RecordingSubscriber subscriber = new RecordingSubscriber(); + subscriber.throwOnSubscribe = true; + BodySubscriber wrapper = wrap(subscriber, continuation); + + assertThrows( + IllegalStateException.class, () -> wrapper.onSubscribe(new RecordingSubscription())); + assertEquals(1, continuation.released); + wrapper.onComplete(); + + assertEquals(1, continuation.released); + } + + @Test + void releasesContinuationWhenOnNextThrows() { + RecordingContinuation continuation = new RecordingContinuation(); + RecordingSubscriber subscriber = new RecordingSubscriber(); + subscriber.throwOnNext = true; + BodySubscriber wrapper = wrap(subscriber, continuation); + + assertThrows(IllegalStateException.class, () -> wrapper.onNext(List.of())); + assertEquals(1, continuation.released); + wrapper.onComplete(); + + assertEquals(1, continuation.released); + } + + @Test + void releasesContinuationWhenSubscriptionIsCancelled() { + RecordingContinuation continuation = new RecordingContinuation(); + RecordingSubscriber subscriber = new RecordingSubscriber(); + BodySubscriber wrapper = wrap(subscriber, continuation); + RecordingSubscription subscription = new RecordingSubscription(); + + wrapper.onSubscribe(subscription); + subscriber.subscription.request(3); + subscriber.subscription.cancel(); + wrapper.onComplete(); + + assertEquals(3, subscription.requested); + assertEquals(1, subscription.cancelled); + assertEquals(1, continuation.released); + } + + private static BodySubscriber wrap( + RecordingSubscriber subscriber, ContextContinuation continuation) { + AgentSpan span = + (AgentSpan) + Proxy.newProxyInstance( + AgentSpan.class.getClassLoader(), + new Class[] {AgentSpan.class}, + (proxy, method, args) -> continuation); + return new BodyHandlerWrapper<>(ignored -> subscriber, span).apply(null); + } + + private static final class RecordingSubscriber + implements java.net.http.HttpResponse.BodySubscriber { + private final CompletableFuture body = new CompletableFuture<>(); + private final List callbackContexts = new ArrayList<>(); + private Flow.Subscription subscription; + private boolean throwOnSubscribe; + private boolean throwOnNext; + + @Override + public CompletionStage getBody() { + return body; + } + + @Override + public void onSubscribe(Flow.Subscription subscription) { + this.subscription = subscription; + if (throwOnSubscribe) { + throw new IllegalStateException("onSubscribe"); + } + } + + @Override + public void onNext(List item) { + callbackContexts.add(Context.current()); + if (throwOnNext) { + throw new IllegalStateException("onNext"); + } + } + + @Override + public void onError(Throwable throwable) { + body.completeExceptionally(throwable); + } + + @Override + public void onComplete() { + callbackContexts.add(Context.current()); + body.complete(null); + } + } + + private static final class RecordingSubscription implements Flow.Subscription { + private long requested; + private int cancelled; + + @Override + public void request(long count) { + requested += count; + } + + @Override + public void cancel() { + cancelled++; + } + } + + private static final class RecordingContinuation implements ContextContinuation { + private int released; + + @Override + public ContextContinuation hold() { + return this; + } + + @Override + public Context context() { + return null; + } + + @Override + public ContextScope resume() { + return null; + } + + @Override + public void release() { + released++; + } + } +} 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 4b3480120fe..1f2dcc9ef93 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 d624b3a5856..ade0826d774 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java index 010a7c26775..303c5bd0636 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/client/RmiClientInstrumentation.java @@ -5,6 +5,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.rmi.RmiClientDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.rmi.RmiClientDecorator.RMI_CLIENT; import static datadog.trace.bootstrap.instrumentation.rmi.RmiClientDecorator.RMI_INVOKE; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.lang.reflect.Method; import net.bytebuddy.asm.Advice; @@ -53,7 +54,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RmiClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Argument(value = 1) final Method method) { + public static ContextScope onEnter(@Advice.Argument(value = 1) final Method method) { if (activeSpan() == null) { return null; } @@ -65,14 +66,14 @@ public static AgentScope onEnter(@Advice.Argument(value = 1) final Method method @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java index ddc5bc5a061..5956b8833c2 100644 --- a/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java +++ b/dd-java-agent/instrumentation/java/java-rmi-1.1/src/main/java/datadog/trace/instrumentation/rmi/server/RmiServerInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.rmi.RmiServerDecorator.DECORATE; import static datadog.trace.bootstrap.instrumentation.rmi.RmiServerDecorator.RMI_REQUEST; import static datadog.trace.bootstrap.instrumentation.rmi.RmiServerDecorator.RMI_SERVER; @@ -14,9 +15,9 @@ import static net.bytebuddy.matcher.ElementMatchers.not; 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 datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import java.lang.reflect.Method; @@ -52,7 +53,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ServerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class, inline = true) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final Object thiz, @Advice.Origin final Method method) { final AgentSpanContext context = THREAD_LOCAL_CONTEXT.getAndResetContext(); @@ -71,14 +72,14 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 23f6e6710be..a6355e0d9bb 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5dc7a29708d..77bdc447c03 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 833de9fec7f..e8484e64a1d 100644 --- a/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-naming-1.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0110cc88863..f472ff1a815 100644 --- a/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/javax-xml-1.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 79b778f12e7..5bbbb863bed 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f2b60c6b874..d70e203995a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jdbc/gradle.lockfile b/dd-java-agent/instrumentation/jdbc/gradle.lockfile index 9b8d53fc3df..0d026e614fa 100644 --- a/dd-java-agent/instrumentation/jdbc/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,latestDepJava11TestCompil com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,oldH2TestAnnotationProcessor,oldPostgresTestAnnotationProcessor,testAnnotationProcessor @@ -49,7 +49,7 @@ com.google.re2j:re2j:1.8=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath 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 -com.h2database:h2:2.4.240=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath +com.h2database:h2:2.5.250=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath com.mchange:c3p0:0.9.5=jmhRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.mchange:c3p0:0.9.5.5=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.mchange:mchange-commons-java:0.2.19=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -76,8 +76,8 @@ javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,latestDepJava11TestCom jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.23=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath @@ -133,7 +133,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,latestDepJav org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,oldH2TestRuntimeClasspath,oldPostgresTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,oldH2TestCompileClasspath,oldH2TestRuntimeClasspath,oldPostgresTestCompileClasspath,oldPostgresTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath 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 f46c96689b8..b519a75de1f 100644 --- a/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/jdbc/scalikejdbc-3.5/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -48,7 +48,7 @@ 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 -com.mchange:c3p0:0.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.mchange:c3p0:0.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.mchange:c3p0:0.9.5=testCompileClasspath,testRuntimeClasspath com.mchange:mchange-commons-java:0.2.9=testCompileClasspath,testRuntimeClasspath com.mchange:mchange-commons-java:0.6.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -71,8 +71,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -131,7 +131,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java new file mode 100644 index 00000000000..f078e5e64d2 --- /dev/null +++ b/dd-java-agent/instrumentation/jdbc/src/jmh/java/datadog/trace/instrumentation/jdbc/DBMCommentSizingBenchmark.java @@ -0,0 +1,111 @@ +package datadog.trace.instrumentation.jdbc; + +import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter; +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.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * 

{@code
+ * Operation     Scenario       Base ns/op       Sized ns/op      Base B/op  Sized B/op
+ * buildComment  short_service   164.8 ±   1.2    107.7 ±  0.8      1629.5       701.5
+ * buildComment  short_full      220.0 ±   2.0    203.3 ±  1.2      1893.5      1037.5
+ * buildComment  long_full      2155.8 ±  15.5   2109.9 ±  8.6      6477.5      4803.0
+ * buildComment  escaped_full   3393.3 ±  79.7   3425.7 ± 25.8     12656.0     10624.0
+ * injectSql     short_service   182.6 ±   1.3    151.8 ±  1.3      1987.0      1059.0
+ * injectSql     short_full      285.0 ±   2.7    250.6 ±  1.3      2395.0      1539.0
+ * injectSql     long_full      3635.6 ±  72.4   3530.2 ± 31.6     17331.0     15656.5
+ * injectSql     escaped_full   3378.1 ± 178.6   3395.9 ± 33.0     14968.0     12936.0
+ * }
+ */ +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(TimeUnit.NANOSECONDS) +@Fork( + value = 3, + jvmArgsAppend = { + "-Xms512m", + "-Xmx512m", + "-Ddd.service=orders", + "-Ddd.env=prod", + "-Ddd.version=1.2.3" + }) +@Warmup(iterations = 3, time = 1) +@Measurement(iterations = 4, time = 1) +@Threads(1) +@State(Scope.Thread) +public class DBMCommentSizingBenchmark { + @Param({"short_service", "short_full", "long_full", "escaped_full"}) + public String scenario; + + String[] services = new String[32], + hosts = new String[32], + databases = new String[32], + parents = new String[32], + queries = new String[32]; + int index; + + @Setup + public void setup() { + for (int i = 0; i < 32; i++) { + services[i] = "orders-db-" + i; + hosts[i] = "db-" + i + ".internal"; + databases[i] = "orders_" + i; + parents[i] = + scenario.equals("short_service") + ? null + : "00-12345678901234567890123456789012" + + String.format("%02x", i) + + "-98765432109876" + + String.format("%02x", i) + + "-01"; + if (scenario.equals("long_full")) { + services[i] = repeat("service", 80) + i; + hosts[i] = repeat("hostname", 30) + i; + databases[i] = repeat("database", 60) + i; + } + if (scenario.equals("escaped_full")) { + services[i] = repeat("café 東京 &/", 16) + i; + databases[i] = repeat("orders '€'", 16) + i; + } + queries[i] = + "SELECT * FROM orders WHERE customer_id = " + + i + + (scenario.equals("long_full") ? " /* " + repeat("query padding ", 280) + " */" : "") + + ";"; + } + } + + static String repeat(String s, int n) { + StringBuilder b = new StringBuilder(); + for (int i = 0; i < n; i++) b.append(s); + return b.toString(); + } + + int next() { + return index++ & 31; + } + + @Benchmark + public String buildComment() { + int i = next(); + return SharedDBCommenter.buildComment( + services[i], "postgresql", hosts[i], databases[i], parents[i]); + } + + @Benchmark + public String injectSql() { + int i = next(); + return SQLCommenter.inject( + queries[i], services[i], "postgresql", hosts[i], databases[i], parents[i], false); + } +} diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java index ba9d7322669..cc2dbcfc2ef 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/AbstractPreparedStatementInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DBM_TRACE_INJECTED; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DATABASE_QUERY; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DBM_TRACE_PREPARED_STATEMENTS; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DECORATE; @@ -13,11 +14,11 @@ import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -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.jdbc.DBInfo; @@ -63,7 +64,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class PreparedStatementAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.This final Statement statement) { + public static ContextScope onEnter(@Advice.This final Statement statement) { int depth = CallDepthThreadLocalMap.incrementCallDepth(Statement.class); if (depth > 0) { return null; @@ -125,15 +126,16 @@ public static AgentScope onEnter(@Advice.This final Statement statement) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { CallDepthThreadLocalMap.decrementCallDepth(Statement.class); if (scope == null) { return; } - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java index fa8a9545d99..59291b453b4 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/DataSourceInstrumentation.java @@ -5,14 +5,15 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jdbc.DataSourceDecorator.DATABASE_CONNECTION; import static datadog.trace.instrumentation.jdbc.DataSourceDecorator.DECORATE; import static datadog.trace.instrumentation.jdbc.DataSourceDecorator.JAVA_JDBC_CONNECTION; 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 javax.sql.DataSource; import net.bytebuddy.asm.Advice; @@ -59,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class GetConnectionAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope start(@Advice.This final DataSource ds) { + public static ContextScope start(@Advice.This final DataSource ds) { if (activeSpan() == null) { // Don't want to generate a new top-level span return null; @@ -75,14 +76,14 @@ public static AgentScope start(@Advice.This final DataSource ds) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java index 767ee6a8914..edb245a6dcf 100644 --- a/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java +++ b/dd-java-agent/instrumentation/jdbc/src/main/java/datadog/trace/instrumentation/jdbc/StatementInstrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.DBM_TRACE_INJECTED; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DATABASE_QUERY; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.DECORATE; import static datadog.trace.instrumentation.jdbc.JDBCDecorator.INJECT_COMMENT; @@ -16,12 +17,12 @@ import com.google.auto.service.AutoService; import datadog.appsec.api.blocking.BlockingException; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.api.propagation.W3CTraceParent; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -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.jdbc.DBInfo; @@ -75,7 +76,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class StatementAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(value = 0, readOnly = false) String sql, @Advice.AllArguments() Object[] args, @Advice.This final Statement statement) { @@ -192,15 +193,16 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { CallDepthThreadLocalMap.decrementCallDepth(Statement.class); if (scope == null) { return; } - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } 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 da27c427158..069971e97ef 100644 --- a/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/jdbc/src/test/groovy/RemoteJDBCInstrumentationTest.groovy @@ -68,12 +68,7 @@ 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)}" - ] + private Map jdbcUrls = new EnumMap<>(DbType) @Shared private Map jdbcDriverClassNames = [ @@ -159,13 +154,20 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { return } - postgres = new PostgreSQLContainer("postgres:11.2") + PostgreSQLContainer server = new PostgreSQLContainer("postgres:11.2") .withDatabaseName(dbName.get(POSTGRESQL)) .withUsername(jdbcUserNames.get(POSTGRESQL)) .withPassword(jdbcPasswords.get(POSTGRESQL)) - postgres.start() - PortUtils.waitForPortToOpen(postgres.getHost(), postgres.getMappedPort(POSTGRESQL_PORT), 5, SECONDS) - jdbcUrls.put(POSTGRESQL, "${postgres.getJdbcUrl()}") + try { + server.start() + PortUtils.waitForPortToOpen(server.getHost(), server.getMappedPort(POSTGRESQL_PORT), 5, SECONDS) + jdbcUrls.put(POSTGRESQL, "${server.getJdbcUrl()}") + postgres = server + } finally { + if (postgres == null) { + server.close() + } + } } private void startMysql() { @@ -173,15 +175,22 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { return } - mysql = new MySQLContainer("mysql:8.0") + MySQLContainer server = new MySQLContainer("mysql:8.0") .withDatabaseName(dbName.get(MYSQL)) .withUsername(jdbcUserNames.get(MYSQL)) .withPassword(jdbcPasswords.get(MYSQL)) // https://github.com/testcontainers/testcontainers-java/issues/914 - mysql.addParameter("TC_MY_CNF", null) - mysql.start() - PortUtils.waitForPortToOpen(mysql.getHost(), mysql.getMappedPort(MYSQL_PORT), 5, SECONDS) - jdbcUrls.put(MYSQL, "${mysql.getJdbcUrl()}") + server.addParameter("TC_MY_CNF", null) + try { + server.start() + PortUtils.waitForPortToOpen(server.getHost(), server.getMappedPort(MYSQL_PORT), 5, SECONDS) + jdbcUrls.put(MYSQL, "${server.getJdbcUrl()}") + mysql = server + } finally { + if (mysql == null) { + server.close() + } + } } private void startSqlserver() { @@ -189,12 +198,21 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { return } - sqlserver = new MSSQLServerContainer(MSSQLServerContainer.IMAGE) + MSSQLServerContainer server = new MSSQLServerContainer(MSSQLServerContainer.IMAGE) .acceptLicense() .withPassword(jdbcPasswords.get(SQLSERVER)) - sqlserver.start() - PortUtils.waitForPortToOpen(sqlserver.getHost(), sqlserver.getMappedPort(MS_SQL_SERVER_PORT), 5, SECONDS) - jdbcUrls.put(SQLSERVER, "${sqlserver.getJdbcUrl()};DatabaseName=${dbName.get(SQLSERVER)}") + // SQL Server can occasionally abort while booting on virtualized CI hosts. + .withStartupAttempts(3) + try { + server.start() + PortUtils.waitForPortToOpen(server.getHost(), server.getMappedPort(MS_SQL_SERVER_PORT), 5, SECONDS) + jdbcUrls.put(SQLSERVER, "${server.getJdbcUrl()};DatabaseName=${dbName.get(SQLSERVER)}") + sqlserver = server + } finally { + if (sqlserver == null) { + server.close() + } + } } private void startOracle() { @@ -204,12 +222,19 @@ abstract class RemoteJDBCInstrumentationTest extends VersionedNamingTestBase { // Earlier Oracle version images (oracle-xe) don't work on arm64 DockerImageName oracleImage = DockerImageName.parse("gvenzl/oracle-free:23.5-slim-faststart").asCompatibleSubstituteFor("gvenzl/oracle-xe") - oracle = new OracleContainer(oracleImage) + OracleContainer server = new OracleContainer(oracleImage) .withStartupTimeout(Duration.ofMinutes(5)) .withUsername(jdbcUserNames.get(ORACLE)) .withPassword(jdbcPasswords.get(ORACLE)) - oracle.start() - jdbcUrls.put(ORACLE, "${oracle.getJdbcUrl()}".replace("xepdb1", dbName.get(ORACLE))) + try { + server.start() + jdbcUrls.put(ORACLE, "${server.getJdbcUrl()}".replace("xepdb1", dbName.get(ORACLE))) + oracle = server + } finally { + if (oracle == null) { + server.close() + } + } } def createTomcatDS(DbType dbType, String jdbcUrl) { 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 d2f448ddd66..4cb5ae7b489 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 @@ -2,7 +2,9 @@ import static datadog.trace.agent.test.utils.TraceUtils.runUnderTrace; import static datadog.trace.test.junit.utils.config.WithConfigExtension.injectSysConfig; +import static java.util.Collections.nCopies; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.params.provider.Arguments.arguments; import datadog.trace.agent.test.AbstractInstrumentationTest; @@ -14,6 +16,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import datadog.trace.bootstrap.instrumentation.dbm.SharedDBCommenter; 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; @@ -25,6 +28,56 @@ class SQLCommenterTest extends AbstractInstrumentationTest { private static final String TRACE_PARENT_SAMPLED = "00-00000000000000007fffffffffffffff-000000024cb016ea-01"; + @Test + void buildsCommentsLargerThanTheOldInitialCapacity() { + configureSizingTest(); + String database = String.join("", nCopies(2048, "d")); + String expected = + "dddbs='orders',ddh='db.internal',dddb='" + + database + + "',traceparent='" + + TRACE_PARENT + + "'"; + assertEquals( + expected, + SharedDBCommenter.buildComment( + "orders", "postgresql", "db.internal", database, TRACE_PARENT)); + assertEquals( + "/*" + expected + "*/ SELECT 1", + SQLCommenter.inject( + "SELECT 1", "orders", "postgresql", "db.internal", database, TRACE_PARENT, false)); + } + + @Test + void sizesCommentsAfterUrlEncodingExpandsTheValues() { + configureSizingTest(); + String database = String.join("", nCopies(256, "東京 €")); + String encodedDatabase = String.join("", nCopies(256, "%E6%9D%B1%E4%BA%AC+%E2%82%AC")); + String expected = "dddbs='caf%C3%A9',ddh='host%27name',dddb='" + encodedDatabase + "'"; + assertEquals( + expected, SharedDBCommenter.buildComment("café", "mysql", "host'name", database, null)); + assertEquals( + "SELECT 1 /*" + expected + "*/;", + SQLCommenter.inject("SELECT 1;", "café", "mysql", "host'name", database, null, true)); + } + + @Test + void preservesEmptyCommentsAndSeparatorsWithoutStaticMetadata() { + configureSizingTest(); + assertNull(SharedDBCommenter.buildComment(null, "mysql", "", null, "")); + assertEquals("SELECT 1", SQLCommenter.inject("SELECT 1", null, "mysql", "", null, "", false)); + assertEquals( + "dddb='orders'", SharedDBCommenter.buildComment("", "mysql", null, "orders", null)); + } + + private static void configureSizingTest() { + injectSysConfig("service", ""); + injectSysConfig("env", ""); + injectSysConfig("version", ""); + injectSysConfig("dbm.inject.sql.basehash", "false"); + SharedDBCommenter.resetStaticPrefixForTesting(); + } + @ParameterizedTest(name = "{0}") @MethodSource("testFindFirstWordArguments") void testFindFirstWord(String scenario, String sql, String firstWord) { 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 988e81d9cb8..a12b84490d3 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java index a24f12030ac..039a8364f60 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-1.4/src/main/java/datadog/trace/instrumentation/jedis/JedisInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jedis.JedisClientDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.jedis.JedisClientDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -11,10 +12,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import net.bytebuddy.matcher.ElementMatcher; @@ -60,7 +61,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JedisAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Command command, @Advice.This final Connection thiz) { if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; @@ -75,15 +76,16 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } CallDepthThreadLocalMap.reset(Connection.class); - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } 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 d6589ab31ae..2bdcf6aa914 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java index 371e84a784a..74d10559c10 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-3.0/src/main/java/datadog/trace/instrumentation/jedis30/JedisInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jedis30.JedisClientDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import redis.clients.jedis.Connection; @@ -51,7 +52,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JedisAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final ProtocolCommand command, @Advice.This final Connection thiz) { if (CallDepthThreadLocalMap.incrementCallDepth(Connection.class) > 0) { return null; @@ -72,15 +73,16 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } CallDepthThreadLocalMap.reset(Connection.class); - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } 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 70d6e060103..02c2e1bc68e 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java index 24350a6a3a6..ab081fb3248 100644 --- a/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java +++ b/dd-java-agent/instrumentation/jedis/jedis-4.0/src/main/java/datadog/trace/instrumentation/jedis40/JedisInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static redis.clients.jedis.JedisClientDecorator.DECORATE; 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 net.bytebuddy.asm.Advice; import redis.clients.jedis.CommandObject; @@ -53,7 +54,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JedisAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandObject commandObject, @Advice.This final Connection thiz) { final AgentSpan span = startSpan("redis-command", JedisClientDecorator.OPERATION_NAME); @@ -74,11 +75,12 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } 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 a2bd4657475..6a19db32426 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jersey/jersey-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jersey2JettyTestCompileClasspath,jersey2Jetty com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,jersey2JettyTestAnnotationProcessor,jersey3JettyTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -86,8 +86,8 @@ javax.xml.bind:jaxb-api:2.2.3=jersey2JettyTestRuntimeClasspath,jersey3JettyTestR javax.xml.stream:stax-api:1.0-2=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -178,7 +178,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jersey2JettyTestRuntimeClasspath org.junit.platform:junit-platform-suite-api:1.14.1=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath,jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.mimepull:mimepull:1.9.15=jersey3JettyTestCompileClasspath,jersey3JettyTestRuntimeClasspath org.jvnet.mimepull:mimepull:1.9.5=jersey2JettyTestCompileClasspath,jersey2JettyTestRuntimeClasspath org.mockito:mockito-core:4.4.0=jersey2JettyTestRuntimeClasspath,jersey3JettyTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java index 70647600ffb..58417311af4 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MessageBodyReaderInstrumentation.java @@ -86,7 +86,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)"); reqCtx.getTraceSegment().effectivelyBlocked(); } diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java index 4728e0eb0f4..c57a71f63da 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/MultiPartHelper.java @@ -106,7 +106,7 @@ public static BlockingException tryBlock(RequestContext ctx, Flow flow, St Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { - brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(ctx, rba); BlockingException be = new BlockingException(message); ctx.getTraceSegment().effectivelyBlocked(); return be; diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java index 16b155b138a..43b6d3c15fa 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/main/java/datadog/trace/instrumentation/jersey2/UriRoutingContextInstrumentation.java @@ -70,7 +70,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException( "Blocked request (for UriRoutingContextInstrumentation/getPathParameters)"); diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/test/groovy/MultiPartHelperTest.groovy b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/test/groovy/MultiPartHelperTest.groovy index e87f828521c..7237594c446 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/test/groovy/MultiPartHelperTest.groovy +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-2.0/src/test/groovy/MultiPartHelperTest.groovy @@ -392,7 +392,7 @@ class MultiPartHelperTest extends Specification { MultiPartHelper.tryBlock(ctx, flow, 'msg') then: - 1 * brf.tryCommitBlockingResponse(segment, rba) + 1 * brf.tryCommitBlockingResponse(ctx, rba) 1 * segment.effectivelyBlocked() } diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java index 4d6ec5beaff..db4b8b9b012 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MessageBodyReaderInstrumentation.java @@ -85,7 +85,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (for ReaderInterceptorExecutor/proceed)"); reqCtx.getTraceSegment().effectivelyBlocked(); } diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java index 9fe6ea94f3d..2ce72d215ef 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/main/java/datadog/trace/instrumentation/jersey3/MultiPartHelper.java @@ -106,7 +106,7 @@ public static BlockingException tryBlock(RequestContext ctx, Flow flow, St Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { - brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(ctx, rba); BlockingException be = new BlockingException(message); ctx.getTraceSegment().effectivelyBlocked(); return be; diff --git a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/test/groovy/MultiPartHelperTest.groovy b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/test/groovy/MultiPartHelperTest.groovy index aa2046ee79d..413c1be3b33 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/test/groovy/MultiPartHelperTest.groovy +++ b/dd-java-agent/instrumentation/jersey/jersey-appsec/jersey-appsec-3.0/src/test/groovy/MultiPartHelperTest.groovy @@ -394,7 +394,7 @@ class MultiPartHelperTest extends Specification { MultiPartHelper.tryBlock(ctx, flow, 'msg') then: - 1 * brf.tryCommitBlockingResponse(segment, rba) + 1 * brf.tryCommitBlockingResponse(ctx, rba) 1 * segment.effectivelyBlocked() } 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 c8a3cd968bc..a787b246c48 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -59,8 +59,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -110,7 +110,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 c77e2d20783..f8e49983eb9 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -60,8 +60,8 @@ javax.validation:validation-api:1.1.0.Final=compileClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -112,7 +112,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java index ee977629437..ccfda136b35 100644 --- a/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jersey/jersey-filter-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JerseyRequestContextInstrumentation.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.jaxrs2; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.lang.reflect.Method; import javax.ws.rs.container.ContainerRequestContext; import javax.ws.rs.container.ResourceInfo; @@ -22,7 +22,8 @@ public class JerseyRequestContextInstrumentation extends AbstractRequestContextInstrumentation { public static class ContainerRequestContextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) { + public static ContextScope decorateAbortSpan( + @Advice.This final ContainerRequestContext context) { final UriInfo uriInfo = context.getUriInfo(); if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null @@ -40,7 +41,7 @@ public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestCo @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { RequestFilterHelper.closeSpanAndScope(scope, throwable); } } 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 d1892c24496..a19c24ba2dc 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 ec8bd617a00..b12bb07b9c8 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.5=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 4c624f9a060..838b941ecdb 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5f418037874..59d3c3cd43e 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 33ef3269beb..4db4b10249e 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 92510301a5a..994fb33879a 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 bce6065c9c0..b40d0fa15e3 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jetty10LatestDepTestCompileClasspath,jetty10L com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,jetty10LatestDepTestAnnotationProcessor,jetty11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRunti javax.servlet:javax.servlet-api:3.1.0=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jetty10LatestDepTestRuntimeClass org.junit.platform:junit-platform-suite-api:1.14.1=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jetty10LatestDepTestRuntimeClasspath,jetty11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jetty10LatestDepTestCompileClasspath,jetty10LatestDepTestRuntimeClasspath,jetty11TestCompileClasspath,jetty11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 8639f4d49cc..d9c1fe9fb3b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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.10=spotbugs @@ -80,18 +80,18 @@ 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.eclipse.jetty.compression:jetty-compression-common:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-alpn-client:12.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-client:12.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-http:12.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-io:12.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 90aa89b4f3e..dee754f9052 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 @@ -4,7 +4,6 @@ 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; import org.eclipse.jetty.client.Response; @@ -121,7 +120,7 @@ public void onSuccess(Request request) { } } - private AgentScope activate(AgentSpan span) { + private ContextScope activate(AgentSpan span) { return null == span ? null : activateSpan(span); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java index cc08b865280..2a762481cdc 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java +++ b/dd-java-agent/instrumentation/jetty/jetty-client/jetty-client-12.0/src/main/java17/datadog/trace/instrumentation/jetty_client12/SendAdvice.java @@ -2,11 +2,12 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jetty_client12.JettyClientDecorator.DECORATE; import static datadog.trace.instrumentation.jetty_client12.JettyClientDecorator.HTTP_REQUEST; +import datadog.context.ContextScope; 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 org.eclipse.jetty.client.Request; @@ -14,7 +15,7 @@ public class SendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.This final HttpRequest request) { + public static ContextScope methodEnter(@Advice.This final HttpRequest request) { AgentSpan span = startSpan("jetty-client", HTTP_REQUEST); InstrumentationContext.get(Request.class, AgentSpan.class).put(request, span); DECORATE.afterStart(span); @@ -24,12 +25,12 @@ public static AgentScope methodEnter(@Advice.This final HttpRequest request) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { try (scope) { if (throwable != null) { DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 83bd92998a6..e791e24cf0b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -107,7 +107,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 3b076f3221b..889e1638ba7 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 8b8aa2972dc..a6408178d1f 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 @@ -3,7 +3,6 @@ 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; import org.eclipse.jetty.client.api.Request; @@ -152,7 +151,7 @@ public void onSuccess(Request request) { } } - private AgentScope activate(AgentSpan span) { + private ContextScope activate(AgentSpan span) { return null == span ? null : activateSpan(span); } } diff --git a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile index b6526783fea..4a1bcb2bb7c 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/jetty/jetty-common/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -107,7 +107,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 ebfd8ada30a..992af5107de 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=earlyDep10ForkedTestCompileClasspath,earlyDep 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-instrument-java:0.0.5=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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,earlyDep10ForkedTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ javax.servlet:javax.servlet-api:3.1.0=earlyDep10ForkedTestCompileClasspath,early javax.websocket:javax.websocket-api:1.0=earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -167,7 +167,6 @@ org.junit.platform:junit-platform-runner:1.14.1=earlyDep10ForkedTestRuntimeClass 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.1=earlyDep10ForkedTestCompileClasspath,earlyDep10ForkedTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 80db21f0a0e..fa4bdca9b6b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -61,8 +61,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest javax.servlet:javax.servlet-api:4.0.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -146,7 +146,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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,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 ef8793346a0..33068c1b813 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=ee10ForkedTestCompileClasspath,ee10ForkedTest com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,ee10ForkedTestAnnotationProcessor,ee10LatestDepForkedTestAnnotationProcessor,ee10LatestDepTestAnnotationProcessor,ee10TestAnnotationProcessor,ee8LatestDepTestAnnotationProcessor,ee8TestAnnotationProcessor,ee9LatestDepTestAnnotationProcessor,ee9TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -73,8 +73,8 @@ jakarta.websocket:jakarta.websocket-client-api:2.1.1=ee10ForkedTestCompileClassp javax.servlet:javax.servlet-api:3.1.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -98,98 +98,98 @@ org.codehaus.groovy:groovy:3.0.23=codenarc org.codehaus.groovy:groovy:3.0.25=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.jetty.compression:jetty-compression-common:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath -org.eclipse.jetty.compression:jetty-compression-gzip:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-common:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.compression:jetty-compression-gzip:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-client:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-common:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-jakarta-server:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10.websocket:jetty-ee10-websocket-servlet:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-annotations:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-annotations:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-annotations:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-plus:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-plus:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-plus:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-servlet:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-servlet:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee10:jetty-ee10-webapp:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath -org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee10:jetty-ee10-webapp:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-client:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-common:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-javax-server:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8.websocket:jetty-ee8-websocket-servlet:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-annotations:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-annotations:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-annotations:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-nested:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-nested:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-nested:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-plus:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-plus:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-plus:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-security:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-security:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-security:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-servlet:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-servlet:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-servlet:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee8:jetty-ee8-webapp:12.0.0=ee8TestCompileClasspath,ee8TestRuntimeClasspath -org.eclipse.jetty.ee8:jetty-ee8-webapp:12.1.12=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee8:jetty-ee8-webapp:12.1.13=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-client:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-client:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-client:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-common:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-common:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-common:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-server:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-server:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-jakarta-server:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-servlet:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-servlet:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9.websocket:jetty-ee9-websocket-servlet:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-annotations:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-annotations:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-annotations:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-nested:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-nested:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-nested:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-plus:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-plus:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-plus:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-security:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-security:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-security:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-servlet:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-servlet:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-servlet:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.ee9:jetty-ee9-webapp:12.0.0=ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.ee9:jetty-ee9-webapp:12.1.12=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath -org.eclipse.jetty.ee:jetty-ee-webapp:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee9:jetty-ee9-webapp:12.1.13=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.ee:jetty-ee-webapp:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.toolchain:jetty-jakarta-servlet-api:5.0.2=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath org.eclipse.jetty.toolchain:jetty-jakarta-websocket-api:2.0.0=ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath org.eclipse.jetty.toolchain:jetty-javax-websocket-api:1.1.2=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.6=ee8TestCompileClasspath,ee8TestRuntimeClasspath org.eclipse.jetty.toolchain:jetty-servlet-api:4.0.9=ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath org.eclipse.jetty.websocket:jetty-websocket-core-client:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.websocket:jetty-websocket-core-client:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.websocket:jetty-websocket-core-client:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.websocket:jetty-websocket-core-common:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.websocket:jetty-websocket-core-common:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.websocket:jetty-websocket-core-common:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty.websocket:jetty-websocket-core-server:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty.websocket:jetty-websocket-core-server:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty.websocket:jetty-websocket-core-server:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-alpn-client:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-alpn-client:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-annotations:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-alpn-client:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-annotations:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-client:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-client:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-client:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-http:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-http:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-http:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-io:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-io:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-io:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-jndi:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-jndi:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-plus:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-jndi:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-plus:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-security:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-security:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-security:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.eclipse.jetty:jetty-server:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-server:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-server:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-session:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath -org.eclipse.jetty:jetty-session:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-session:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-util:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -org.eclipse.jetty:jetty-util:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-util:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-xml:12.0.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath -org.eclipse.jetty:jetty-xml:12.1.12=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath +org.eclipse.jetty:jetty-xml:12.1.13=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath 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 @@ -207,7 +207,6 @@ org.junit.platform:junit-platform-runner:1.14.1=ee10ForkedTestRuntimeClasspath,e org.junit.platform:junit-platform-suite-api:1.14.1=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom: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:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -226,7 +225,8 @@ org.slf4j:log4j-over-slf4j:1.7.30=ee10ForkedTestCompileClasspath,ee10ForkedTestR org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath org.slf4j:slf4j-api:1.7.32=ee10ForkedTestCompileClasspath,ee10ForkedTestRuntimeClasspath,ee10TestCompileClasspath,ee10TestRuntimeClasspath,ee8TestCompileClasspath,ee8TestRuntimeClasspath,ee9TestCompileClasspath,ee9TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.18=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +org.slf4j:slf4j-api:2.0.18=spotbugs +org.slf4j:slf4j-api:2.0.19=ee10LatestDepForkedTestCompileClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestCompileClasspath,ee10LatestDepTestRuntimeClasspath,ee8LatestDepTestCompileClasspath,ee8LatestDepTestRuntimeClasspath,ee9LatestDepTestCompileClasspath,ee9LatestDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,ee10ForkedTestRuntimeClasspath,ee10LatestDepForkedTestRuntimeClasspath,ee10LatestDepTestRuntimeClasspath,ee10TestRuntimeClasspath,ee8LatestDepTestRuntimeClasspath,ee8TestRuntimeClasspath,ee9LatestDepTestRuntimeClasspath,ee9TestRuntimeClasspath,latestDepTestRuntimeClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.spockframework:spock-bom:2.4-groovy-3.0=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-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 30598db7d65..94299a1e141 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 @@ -6,8 +6,9 @@ import datadog.context.Context; import datadog.context.ContextContinuation; import datadog.context.ContextScope; +import org.eclipse.jetty.util.thread.Invocable; -public class JettyRunnableWrapper implements Runnable { +public class JettyRunnableWrapper implements Runnable, Invocable { private Runnable runnable; private ContextContinuation continuation; @@ -17,6 +18,11 @@ public JettyRunnableWrapper(Runnable runnable, ContextContinuation continuation) this.continuation = continuation; } + @Override + public InvocationType getInvocationType() { + return Invocable.getInvocationType(runnable); + } + @Override public void run() { try (ContextScope scope = continuation.resume()) { diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java new file mode 100644 index 00000000000..8d5e91244e6 --- /dev/null +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-12.0/src/test/java/datadog/trace/instrumentation/jetty12/JettyRunnableWrapperTest.java @@ -0,0 +1,105 @@ +package datadog.trace.instrumentation.jetty12; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.context.Context; +import datadog.context.ContextKey; +import datadog.context.ContextScope; +import java.util.ArrayDeque; +import java.util.Queue; +import java.util.concurrent.atomic.AtomicBoolean; +import org.eclipse.jetty.util.thread.Invocable; +import org.eclipse.jetty.util.thread.Invocable.InvocationType; +import org.eclipse.jetty.util.thread.strategy.AdaptiveExecutionStrategy; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; + +class JettyRunnableWrapperTest { + private static final Context REQUEST = Context.root().with(ContextKey.named("request"), "jetty"); + + @ParameterizedTest + @EnumSource(InvocationType.class) + void preservesInvocationTypeAndContext(InvocationType type) { + Context caller = Context.current(); + AtomicBoolean ran = new AtomicBoolean(); + Runnable task = + wrap( + Invocable.from( + type, + () -> { + assertSame(REQUEST, Context.current()); + ran.set(true); + })); + + assertEquals(type, Invocable.getInvocationType(task)); + assertSame(caller, Context.current()); + task.run(); + assertTrue(ran.get()); + assertSame(caller, Context.current()); + } + + @Test + void plainRunnableRemainsBlocking() { + Runnable task = wrap(() -> {}); + assertEquals(InvocationType.BLOCKING, Invocable.getInvocationType(task)); + task.run(); + } + + @Test + void restoresContextWhenTaskThrows() { + Context caller = Context.current(); + RuntimeException failure = new RuntimeException("task failed"); + Runnable task = + wrap( + Invocable.from( + InvocationType.NON_BLOCKING, + () -> { + assertSame(REQUEST, Context.current()); + throw failure; + })); + assertSame(failure, assertThrows(RuntimeException.class, task::run)); + assertSame(caller, Context.current()); + } + + @Test + void nonBlockingTaskRunsWithoutExecutorHandoff() throws Exception { + Queue produced = new ArrayDeque<>(); + Queue dispatched = new ArrayDeque<>(); + AtomicBoolean ran = new AtomicBoolean(); + Thread producer = Thread.currentThread(); + produced.add( + wrap( + Invocable.from( + InvocationType.NON_BLOCKING, + () -> { + assertSame(producer, Thread.currentThread()); + assertSame(REQUEST, Context.current()); + ran.set(true); + }))); + AdaptiveExecutionStrategy strategy = + new AdaptiveExecutionStrategy(produced::poll, dispatched::add); + Context caller = Context.current(); + strategy.start(); + try { + strategy.produce(); + assertTrue(ran.get()); + assertTrue(dispatched.isEmpty(), "nonblocking tasks should run on the producer"); + assertSame(caller, Context.current()); + } finally { + strategy.stop(); + while (!dispatched.isEmpty()) { + dispatched.remove().run(); + } + } + } + + private static Runnable wrap(Runnable task) { + try (ContextScope ignored = REQUEST.attach()) { + return JettyRunnableWrapper.wrapIfNeeded(task); + } + } +} 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 2f426a58257..286799a8d59 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,testRuntimeClassp javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -111,7 +111,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.mortbay.jetty:servlet-api:3.0.20100224=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestImplementation org.objenesis:objenesis:3.3=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 1ba07d39e04..1319cd7d6d6 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,testRuntimeClassp javax.servlet:servlet-api:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 8ea671b97e1..7f21eb602d9 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest javax.websocket:javax.websocket-api:1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -126,7 +126,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 c6f2d122702..9ae09e94293 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testFixturesCompileClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ javax.servlet:javax.servlet-api:3.1.0=testFixturesCompileClasspath,testFixturesR javax.websocket:javax.websocket-api:1.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -106,7 +106,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testFixturesRuntimeClasspath,tes org.junit.platform:junit-platform-suite-api:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java index 61fd9cc8c17..449aa1c125f 100644 --- a/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java +++ b/dd-java-agent/instrumentation/jetty/jetty-server/jetty-server-9.0/src/main/java/datadog/trace/instrumentation/jetty9/WebSocketSessionInstrumentation.java @@ -7,11 +7,11 @@ import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; 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.api.InstrumenterConfig; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.util.Collections; import java.util.Map; @@ -61,7 +61,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class CloseAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final Object session, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { @@ -81,7 +81,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable thrown, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { if (scope != null) { 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 824c3bb1899..485cd3623f2 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 @@ -25,9 +25,11 @@ dependencies { } testImplementation project(':dd-java-agent:instrumentation:jetty:jetty-util-9.4.31') - testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.0.M1' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.0.M1' - testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.3.0.M1' + // Keep M1 as the compile/muzzle floor. Jetty 452465 makes its test runtime spin on peer EOF + // after request recycling; behavioral tests use the first stable 9.3 release containing the fix. + testImplementation group: 'org.eclipse.jetty', name: 'jetty-server', version: '9.3.0.v20150612' + testImplementation group: 'org.eclipse.jetty', name: 'jetty-servlet', version: '9.3.0.v20150612' + testImplementation group: 'org.eclipse.jetty', name: 'jetty-continuation', version: '9.3.0.v20150612' 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')) 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 e3406acbe3a..23a53f43a5e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,8 +58,8 @@ javax.websocket:javax.websocket-api:1.0=latestDepForkedTestCompileClasspath,late javax.websocket:javax.websocket-client-api:1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -92,21 +92,25 @@ org.eclipse.jetty.websocket:websocket-server:9.4.20.v20190813=latestDepForkedTes org.eclipse.jetty.websocket:websocket-servlet:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-annotations:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-client:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-continuation:9.3.0.M1=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-continuation:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-continuation:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-http:9.3.0.M1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-http:9.3.0.M1=compileClasspath +org.eclipse.jetty:jetty-http:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-http:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-io:9.3.0.M1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-io:9.3.0.M1=compileClasspath +org.eclipse.jetty:jetty-io:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-io:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-jndi:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-plus:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-security:9.3.0.M1=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-security:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-security:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-server:9.3.0.M1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-server:9.3.0.M1=compileClasspath +org.eclipse.jetty:jetty-server:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-server:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-servlet:9.3.0.M1=testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-servlet:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-servlet:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.eclipse.jetty:jetty-util:9.3.0.M1=compileClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jetty:jetty-util:9.3.0.M1=compileClasspath +org.eclipse.jetty:jetty-util:9.3.0.v20150612=testCompileClasspath,testRuntimeClasspath org.eclipse.jetty:jetty-util:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-webapp:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.eclipse.jetty:jetty-xml:9.4.20.v20190813=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -127,7 +131,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e30c64edb42..c1d207a787c 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,8 +58,8 @@ javax.websocket:javax.websocket-api:1.0=latestDepForkedTestCompileClasspath,late javax.websocket:javax.websocket-client-api:1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -128,7 +128,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 94a1c6af5f2..85338a4c02a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e0f0d650f39..3597c694a12 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ javax.inject:javax.inject:1=testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -120,7 +120,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 9c79b7ef41c..7031b4f4395 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest javax.transaction:javax.transaction-api:1.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java index 3dbfa0579f5..3a2d482de8a 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/JMSMessageProducerInstrumentation.java @@ -10,6 +10,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jms.JMSDecorator.JMS_PRODUCE; import static datadog.trace.instrumentation.jms.JMSDecorator.PRODUCER_DECORATE; import static datadog.trace.instrumentation.jms.JMSDecorator.TIME_IN_QUEUE_ENABLED; @@ -18,6 +19,7 @@ import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.api.Config; @@ -25,7 +27,6 @@ import datadog.trace.api.datastreams.DataStreamsTags; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -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.jms.MessageProducerState; @@ -73,7 +74,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ProducerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeSend( + public static ContextScope beforeSend( @Advice.Argument(0) final Message message, @Advice.This final MessageProducer producer) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(MessageProducer.class); if (callDepth > 0) { @@ -126,14 +127,14 @@ public static AgentScope beforeSend( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterSend( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } PRODUCER_DECORATE.onError(scope, throwable); PRODUCER_DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); CallDepthThreadLocalMap.reset(MessageProducer.class); } } @@ -160,7 +161,7 @@ public static void onEnter( public static class ProducerWithDestinationAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeSend( + public static ContextScope beforeSend( @Advice.Argument(0) final Destination destination, @Advice.Argument(1) final Message message, @Advice.This final MessageProducer producer) { @@ -201,14 +202,14 @@ public static AgentScope beforeSend( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterSend( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } PRODUCER_DECORATE.onError(scope, throwable); PRODUCER_DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); CallDepthThreadLocalMap.reset(MessageProducer.class); } } diff --git a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java index 9ae776c7ed4..c8b04c89c97 100644 --- a/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java +++ b/dd-java-agent/instrumentation/jms/javax-jms-1.1/src/main/java/datadog/trace/instrumentation/jms/MDBMessageConsumerInstrumentation.java @@ -9,6 +9,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.rootContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jms.JMSDecorator.CONSUMER_DECORATE; import static datadog.trace.instrumentation.jms.JMSDecorator.JMS_CONSUME; import static datadog.trace.instrumentation.jms.JMSDecorator.logJMSException; @@ -22,7 +23,6 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.annotation.AppliesOn; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.jms.Destination; import javax.jms.JMSException; @@ -81,7 +81,7 @@ public static void onExit(@Advice.Local("ctxScope") ContextScope scope) { public static class MDBAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(0) final Message message) { + public static ContextScope methodEnter(@Advice.Argument(0) final Message message) { if (CallDepthThreadLocalMap.incrementCallDepth(MessageListener.class) > 0) { return null; } @@ -103,12 +103,12 @@ public static AgentScope methodEnter(@Advice.Argument(0) final Message message) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter ContextScope scope, @Advice.Thrown final Throwable throwable) { if (null != scope) { CallDepthThreadLocalMap.reset(MessageListener.class); CONSUMER_DECORATE.onError(scope, throwable); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 7e4fac94dfc..0bdb5d01db7 100644 --- a/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/jose-jwt-4.0/gradle.lockfile @@ -10,7 +10,7 @@ com.auth0:java-jwt:4.0.0-beta.0=latestDepTestCompileClasspath,latestDepTestRunti 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-instrument-java:0.0.5=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 @@ -27,8 +27,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile index f769f571c72..9fee7fcd5c8 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/jsp-2.3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,test javax.servlet:javax.servlet-api:4.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -71,13 +71,13 @@ org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.tomcat.embed:tomcat-embed-core:7.0.37=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.121=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:9.0.121=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.122=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:9.0.122=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-jasper:7.0.37=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-jasper:9.0.121=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-jasper:9.0.122=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.121=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:9.0.122=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 @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java index 89efa564eb8..fdea60ec215 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPDecorator.java @@ -1,6 +1,8 @@ package datadog.trace.instrumentation.jsp; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; + +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator; @@ -30,9 +32,10 @@ protected CharSequence component() { return JSP_HTTP_SERVLET; } - public void onCompile(final AgentScope scope, final JspCompilationContext jspCompilationContext) { + public void onCompile( + final ContextScope scope, final JspCompilationContext jspCompilationContext) { if (jspCompilationContext != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); span.setResourceName(jspCompilationContext.getJspFile()); if (jspCompilationContext.getServletContext() != null) { diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java index ce2d37251b6..d8b98526804 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JSPInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jsp.JSPDecorator.DECORATE; import static datadog.trace.instrumentation.jsp.JSPDecorator.JSP_HTTP_SERVLET; import static datadog.trace.instrumentation.jsp.JSPDecorator.JSP_RENDER; @@ -11,9 +12,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 javax.servlet.http.HttpServletRequest; import net.bytebuddy.asm.Advice; @@ -58,7 +59,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class HttpJspPageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final Object obj, @Advice.Argument(0) final HttpServletRequest req) { final AgentSpan span = startSpan(JSP_HTTP_SERVLET.toString(), JSP_RENDER) @@ -70,11 +71,11 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java index 2bec868dac1..71918ce5332 100644 --- a/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java +++ b/dd-java-agent/instrumentation/jsp-2.3/src/main/java/datadog/trace/instrumentation/jsp/JasperJSPCompilationContextInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jsp.JSPDecorator.DECORATE; import static datadog.trace.instrumentation.jsp.JSPDecorator.JSP_COMPILE; import static datadog.trace.instrumentation.jsp.JSPDecorator.JSP_HTTP_SERVLET; @@ -10,9 +11,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import org.apache.jasper.JspCompilationContext; @@ -48,7 +49,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JasperJspCompilationContext { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter() { + public static ContextScope onEnter() { final AgentSpan span = startSpan(JSP_HTTP_SERVLET.toString(), JSP_COMPILE); DECORATE.afterStart(span); return activateSpan(span); @@ -57,7 +58,7 @@ public static AgentScope onEnter() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( @Advice.This final JspCompilationContext jspCompilationContext, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { DECORATE.onCompile(scope, jspCompilationContext); // ^ Decorate on return because additional properties are available @@ -65,7 +66,7 @@ public static void stopSpan( DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 ef893ec1597..a16fe5044f8 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,24 +58,24 @@ commons-io:commons-io:2.21.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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-java:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.8=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.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:datatable:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.cucumber:docstring:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.8=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 @@ -94,8 +94,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13=compileClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -142,7 +142,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 a774e8730af..a8e41ce2017 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -68,8 +68,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -123,7 +123,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -169,10 +168,10 @@ org.scala-sbt:zinc-persist-core-assembly:1.12.0=zinc org.scala-sbt:zinc-persist_2.13:1.12.0=zinc org.scala-sbt:zinc_2.13:1.12.0=zinc org.scalameta:junit-interface:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:junit-interface:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.scalameta:munit-diff_2.13:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:junit-interface:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit-diff_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.scalameta:munit_2.13:0.7.28=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.scalameta:munit_2.13:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.scalameta:munit_2.13:1.3.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 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 9d4198fdd92..89b7a6a4349 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestIm com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,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.10.3=compileClasspath,compileOnlyDependenciesMetadata,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileOnlyDependenciesMetadata,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs junit:junit:4.10=compileClasspath,compileOnlyDependenciesMetadata junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -129,7 +129,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 106518859c9..4a483a1268d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13=compileClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -109,7 +109,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java index bd2405bab66..89fb61c89f9 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterInstrumentation.java @@ -4,9 +4,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.junit.runner.manipulation.InvalidOrderingException; import org.junit.runner.manipulation.Ordering; @@ -47,13 +47,13 @@ public void methodAdvice(MethodTransformer transformer) { public static class RunBeforesAftersAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope startCallSpan(@Advice.Argument(0) final FrameworkMethod method) { + public static ContextScope startCallSpan(@Advice.Argument(0) final FrameworkMethod method) { return JUnit4BeforeAfterOperationsTracer.startTrace(method.getMethod()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishCallSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { JUnit4BeforeAfterOperationsTracer.endTrace(scope, throwable); } diff --git a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java index 1e41f817349..01602f656c3 100644 --- a/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java +++ b/dd-java-agent/instrumentation/junit/junit-4/junit-4.13/src/main/java/datadog/trace/instrumentation/junit4/JUnit4BeforeAfterOperationsTracer.java @@ -1,6 +1,8 @@ package datadog.trace.instrumentation.junit4; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; + +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; @@ -12,7 +14,7 @@ import org.junit.runners.Parameterized; public class JUnit4BeforeAfterOperationsTracer { - public static AgentScope startTrace(final Method method) { + public static ContextScope startTrace(final Method method) { final AgentSpan span = AgentTracer.startSpan("junit", method.getName()); if (method.isAnnotationPresent(Before.class)) { span.setTag(Tags.TEST_CALLBACK, "Before"); @@ -30,8 +32,8 @@ public static AgentScope startTrace(final Method method) { return AgentTracer.activateSpan(span); } - public static void endTrace(final AgentScope scope, final Throwable throwable) { - final AgentSpan span = scope.span(); + public static void endTrace(final ContextScope scope, final Throwable throwable) { + final AgentSpan span = spanFromScope(scope); if (throwable != null) { span.addThrowable(throwable); } 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 51e7ca4e6d3..f330cc1975b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=cucumber723TestCompileClasspath,cucumber723Te com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ com.github.jnr:jnr-ffi:2.2.19=cucumber723TestRuntimeClasspath,cucumber76TestRunt com.github.jnr:jnr-posix:3.1.22=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,cucumber723TestAnnotationProcessor,cucumber723TestCompileClasspath,cucumber76TestAnnotationProcessor,cucumber76TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor,cucumber723TestAnnotationProcessor,cucumber76TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,40 +61,40 @@ io.cucumber:ci-environment:12.0.0=latestDepTestCompileClasspath,latestDepTestRun io.cucumber:ci-environment:9.1.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:cucumber-core:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-core:7.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-core:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-core:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-core:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:cucumber-expressions:16.0.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:cucumber-expressions:18.0.1=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath 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.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-gherkin-messages:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin-messages:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-gherkin-messages:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath 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.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-gherkin:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-gherkin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-gherkin:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:cucumber-java:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-java:7.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-java:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-java:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-java:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath 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.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-junit-platform-engine:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-junit-platform-engine:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-junit-platform-engine:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:cucumber-plugin:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:cucumber-plugin:7.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:cucumber-plugin:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:cucumber-plugin:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:cucumber-plugin:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:datatable:3.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:datatable:7.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:datatable:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:datatable:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:datatable:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:docstring:5.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.cucumber:docstring:7.23.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath -io.cucumber:docstring:7.34.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.cucumber:docstring:7.34.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.cucumber:docstring:7.6.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:gherkin:24.0.0=cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath io.cucumber:gherkin:32.1.1=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath @@ -124,8 +124,8 @@ io.sqreen:libsqreen:17.5.0=cucumber723TestRuntimeClasspath,cucumber76TestRuntime javax.servlet:javax.servlet-api:3.1.0=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.9=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -190,7 +190,6 @@ org.junit.platform:junit-platform-suite:1.14.2=latestDepTestCompileClasspath,lat org.junit:junit-bom:5.14.1=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.junit:junit-bom:5.6.0=compileClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=cucumber723TestRuntimeClasspath,cucumber76TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=cucumber723TestCompileClasspath,cucumber723TestRuntimeClasspath,cucumber76TestCompileClasspath,cucumber76TestRuntimeClasspath,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 fdd383cc248..f74e42fe8fe 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -27,8 +27,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -120,7 +120,6 @@ org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClass org.junit.platform:junit-platform-testkit:1.7.2=compileClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.7.2=compileClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy index 20b65ca7bf6..a0104cfeb1f 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestParameterizedSetupSpecSpock.groovy @@ -1,6 +1,6 @@ package org.example -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 spock.lang.Specification @@ -10,7 +10,7 @@ class TestParameterizedSetupSpecSpock extends Specification { def setupSpec() { AgentTracer.TracerAPI agentTracer = AgentTracer.get() AgentSpan span = agentTracer.buildSpan("spock-manual", "spec-setup").start() - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // manually trace spec setup to check whether ITR skips it or not } span.finish() diff --git a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy index d31301e8379..712b544fae8 100644 --- a/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy +++ b/dd-java-agent/instrumentation/junit/junit-5/junit-5-spock-2.0/src/test/groovy/org/example/TestSucceedSetupSpecSpock.groovy @@ -1,6 +1,6 @@ package org.example -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 spock.lang.Specification @@ -10,7 +10,7 @@ class TestSucceedSetupSpecSpock extends Specification { def setupSpec() { AgentTracer.TracerAPI agentTracer = AgentTracer.get() AgentSpan span = agentTracer.buildSpan("spock-manual", "spec-setup").start() - try (AgentScope scope = agentTracer.activateManualSpan(span)) { + try (ContextScope scope = agentTracer.activateManualSpan(span)) { // manually trace spec setup to check whether ITR skips it or not } span.finish() 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 bade27ada0a..a5f00162558 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latest5TestCompileClasspath,latest5TestRuntim com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest5TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,v513TestAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClass javax.servlet:javax.servlet-api:3.1.0=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest5TestCompileClasspath,latest5TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath net.java.dev.jna:jna:5.8.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath net.minidev:accessors-smart:2.4.9=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath @@ -132,7 +132,6 @@ org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClass org.junit.platform:junit-platform-suite-commons:1.14.4=latest5TestRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath,v513TestCompileClasspath,v513TestRuntimeClasspath org.junit:junit-bom:5.14.4=latest5TestCompileClasspath,latest5TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.junit:junit-bom:6.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=latest5TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,v513TestRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=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 5337fc12abf..81b398c3c8d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -122,7 +122,6 @@ org.junit.platform:junit-platform-suite-api:6.1.3=latestDepTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.8.0=compileClasspath -org.junit:junit-bom:6.1.2=spotbugs org.junit:junit-bom:6.1.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=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 1f6f2ea2ea0..2d0e6394d23 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 @@ -11,7 +11,7 @@ com.101tec:zkclient:0.10=iastLatestDepTest3CompileClasspath,iastLatestDepTest3Ru com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,iastLatestDepTest3AnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -96,8 +96,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.12=iastLatestDepTest3CompileClasspath,testCompileClasspath junit:junit:4.13.2=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.16=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.jpountz.lz4:lz4:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -160,7 +160,6 @@ org.junit.platform:junit-platform-runner:1.14.1=iastLatestDepTest3RuntimeClasspa org.junit.platform:junit-platform-suite-api:1.14.1=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=iastLatestDepTest3CompileClasspath,iastLatestDepTest3RuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=latestDepTestRuntimeClasspath org.mockito:mockito-core:2.19.0=iastLatestDepTest3CompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.mockito:mockito-core:4.4.0=iastLatestDepTest3RuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java index e428a73d94b..0ba96be626d 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/main/java/datadog/trace/instrumentation/kafka_clients/KafkaConsumerInfoInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.KAFKA_RECORDS_COUNT; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.JAVA_KAFKA; import static datadog.trace.instrumentation.kafka_clients.KafkaDecorator.KAFKA_POLL; import static net.bytebuddy.matcher.ElementMatchers.isConstructor; @@ -17,11 +18,11 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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.api.Config; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.kafka_common.ClusterIdHolder; import datadog.trace.instrumentation.kafka_common.KafkaConfigHelper; @@ -236,7 +237,7 @@ public static void muzzleCheck(ConsumerRecord record) { */ public static class RecordsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.This KafkaConsumer consumer) { + public static ContextScope onEnter(@Advice.This KafkaConsumer consumer) { // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(KafkaConsumer.class, KafkaConsumerInfo.class).get(consumer); @@ -261,7 +262,7 @@ public static AgentScope onEnter(@Advice.This KafkaConsumer consumer) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void captureGroup( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.This KafkaConsumer consumer, @Advice.Return ConsumerRecords records, @Advice.Thrown Throwable throwable) { @@ -281,7 +282,7 @@ public static void captureGroup( if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); span.setTag(KAFKA_RECORDS_COUNT, recordsCount); if (!(throwable instanceof WakeupException)) { span.addThrowable(throwable); 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 f0309fbcb84..98e415b4cd4 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 @@ -27,6 +27,7 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.context.propagation.Propagator; import datadog.context.propagation.Propagators; import datadog.trace.agent.tooling.Instrumenter; @@ -38,7 +39,6 @@ import datadog.trace.api.datastreams.DataStreamsTransactionExtractor; import datadog.trace.api.datastreams.StatsPoint; import datadog.trace.bootstrap.InstrumentationContext; -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; @@ -135,7 +135,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ProducerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.FieldValue("producerConfig") ProducerConfig producerConfig, @Advice.FieldValue("sender") Sender sender, @Advice.FieldValue("metadata") Metadata metadata, @@ -180,7 +180,7 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { // Clear cluster ID from Schema Registry instrumentation ClusterIdHolder.clear(); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaReactorForkedTest.groovy b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaReactorForkedTest.groovy index 49ec8900712..08ec9fb0513 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaReactorForkedTest.groovy +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/src/test/groovy/KafkaReactorForkedTest.groovy @@ -129,17 +129,17 @@ class KafkaReactorForkedTest extends InstrumentationSpecification { } }) - // create a thread safe queue to store the received message - kafkaReceiver.receive() + def commitsCompleted = new CountDownLatch(100) + def receiverSubscription = kafkaReceiver.receive() // publish on another thread to be sure we're propagating that receive span correctly .publishOn(Schedulers.parallel()) - .flatMap { - receiverRecord -> { - receiverRecord.receiverOffset().commit() - } + .flatMap { receiverRecord -> + receiverRecord.receiverOffset().commit().then(Mono.just(receiverRecord)) } .subscribeOn(Schedulers.parallel()) - .subscribe() + .subscribe { + commitsCompleted.countDown() + } // wait until the container has the required number of assigned partitions @@ -152,12 +152,13 @@ class KafkaReactorForkedTest extends InstrumentationSpecification { kafkaSender.send(Mono.just(SenderRecord.create(new ProducerRecord<>(KafkaClientTestBase.SHARED_TOPIC, greeting), null))) } .publishOn(Schedulers.parallel()) - .subscribe() + .blockLast() + assert commitsCompleted.await(30, TimeUnit.SECONDS) + receiverSubscription.dispose() then: // check that the all the consume (100) and the send (100) are reported TEST_WRITER.waitForTraces(200) - Map> traces = TEST_WRITER.inject([:]) { - map, entry -> + Map> traces = TEST_WRITER.inject([:]) { map, entry -> def key = entry.get(0).getTraceId().toString() map[key] = (map[key] ?: []) + entry return map @@ -174,6 +175,9 @@ class KafkaReactorForkedTest extends InstrumentationSpecification { assert it.get(consumeIndex).getParentId() == it.get(produceIndex).getSpanId() assert it.get(produceIndex).getParentId() == 0 } + cleanup: + receiverSubscription?.dispose() + kafkaSender?.close() } def producerSpan( 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 e34e0dcd377..bec7bcba832 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.3.15=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -73,7 +73,7 @@ commons-logging:commons-logging:1.2=latestDepForkedTestRuntimeClasspath,latestDe commons-validator:commons-validator:1.7=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.dropwizard.metrics:metrics-core:4.1.12.1=testRuntimeClasspath -io.dropwizard.metrics:metrics-core:4.2.39=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.dropwizard.metrics:metrics-core:4.2.40=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.14.5=testCompileClasspath,testRuntimeClasspath io.micrometer:micrometer-commons:1.15.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -104,8 +104,8 @@ javax.xml.bind:jaxb-api:2.2.3=latestDepForkedTestCompileClasspath,latestDepForke javax.xml.stream:stax-api:1.0-2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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 net.sf.jopt-simple:jopt-simple:5.0.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -181,7 +181,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:2.19.0=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java index 01905ee65e4..716683d7011 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/ProducerAdvice.java @@ -8,8 +8,8 @@ import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.KAFKA_PRODUCE; import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.PRODUCER_DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -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.InstrumentationTags; @@ -25,7 +25,7 @@ public class ProducerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.FieldValue("producerConfig") ProducerConfig producerConfig, @Advice.FieldValue("sender") Sender sender, @Advice.FieldValue("metadata") Metadata metadata, @@ -70,7 +70,7 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { // Clear cluster ID from Schema Registry instrumentation ClusterIdHolder.clear(); diff --git a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java index b8f3dff049a..418966c4cb8 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java +++ b/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/src/main/java17/datadog/trace/instrumentation/kafka_clients38/RecordsAdvice.java @@ -4,12 +4,13 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.KAFKA_RECORDS_COUNT; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.JAVA_KAFKA; import static datadog.trace.instrumentation.kafka_clients38.KafkaDecorator.KAFKA_POLL; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.kafka_common.ClusterIdHolder; import datadog.trace.instrumentation.kafka_common.MetadataState; @@ -26,7 +27,7 @@ */ public class RecordsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.This ConsumerDelegate consumer) { + public static ContextScope onEnter(@Advice.This ConsumerDelegate consumer) { // Set cluster ID in ClusterIdHolder for Schema Registry instrumentation KafkaConsumerInfo kafkaConsumerInfo = InstrumentationContext.get(ConsumerDelegate.class, KafkaConsumerInfo.class).get(consumer); @@ -48,7 +49,7 @@ public static AgentScope onEnter(@Advice.This ConsumerDelegate consumer) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void captureGroup( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.This ConsumerDelegate consumer, @Advice.Return ConsumerRecords records, @Advice.Thrown Throwable throwable) { @@ -70,7 +71,7 @@ public static void captureGroup( if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); span.setTag(KAFKA_RECORDS_COUNT, recordsCount); if (!(throwable instanceof WakeupException)) { span.addThrowable(throwable); diff --git a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile index 8085cdad5b6..04e096c52a7 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/kafka/kafka-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jpountz.lz4:lz4:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f4224fe48c8..31a25678789 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -39,8 +39,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -97,8 +97,8 @@ javax.xml.bind:jaxb-api:2.3.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath log4j:log4j:1.2.17=compileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jpountz.lz4:lz4:1.3.0=compileClasspath @@ -214,7 +214,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:2.19.0=testCompileClasspath org.mockito:mockito-core:4.4.0=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 a4c10c56a91..68505189325 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 @@ -10,7 +10,7 @@ com.101tec:zkclient:0.10=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-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -85,8 +85,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.12=testCompileClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.16=testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jpountz.lz4:lz4:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -148,7 +148,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-core:2.19.0=latestDepTestCompileClasspath,testCompileClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath 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 81ddfd4202f..0da251f1cd5 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 @@ -11,6 +11,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.traceConfig; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.rootContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.kafka_common.StreamingContext.STREAMING_CONTEXT; import static datadog.trace.instrumentation.kafka_common.Utils.computePayloadSizeBytes; import static datadog.trace.instrumentation.kafka_streams.KafkaStreamsDecorator.BROKER_DECORATE; @@ -42,7 +43,6 @@ import datadog.trace.api.datastreams.DataStreamsContext; import datadog.trace.api.datastreams.DataStreamsTags; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.instrumentation.kafka_clients.TracingIterableDelegator; @@ -316,7 +316,7 @@ public static void start( CONSUMER_DECORATE.afterStart(span); CONSUMER_DECORATE.onConsume(span, record, node); - AgentScope agentScope = activateSpan(span); + ContextScope scope = activateSpan(span); if (null != queueSpan) { queueSpan.finish(); } @@ -324,7 +324,7 @@ public static void start( if (streamTaskContext == null) { streamTaskContext = new StreamTaskContext(); } - streamTaskContext.setAgentScope(agentScope); + streamTaskContext.setScope(scope); InstrumentationContext.get(StreamTask.class, StreamTaskContext.class) .put(task, streamTaskContext); } @@ -388,7 +388,7 @@ public static void start( CONSUMER_DECORATE.afterStart(span); CONSUMER_DECORATE.onConsume(span, record, node); - AgentScope agentScope = activateSpan(span); + ContextScope scope = activateSpan(span); if (null != queueSpan) { queueSpan.finish(); } @@ -396,7 +396,7 @@ public static void start( if (streamTaskContext == null) { streamTaskContext = new StreamTaskContext(); } - streamTaskContext.setAgentScope(agentScope); + streamTaskContext.setScope(scope); InstrumentationContext.get(StreamTask.class, StreamTaskContext.class) .put(task, streamTaskContext); } @@ -410,14 +410,14 @@ public static void stop( StreamTaskContext streamTaskContext = InstrumentationContext.get(StreamTask.class, StreamTaskContext.class).get(task); if (streamTaskContext != null) { - AgentScope scope = streamTaskContext.getAgentScope(); + ContextScope scope = streamTaskContext.getScope(); if (scope != null) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); CONSUMER_DECORATE.onError(span, throwable); CONSUMER_DECORATE.beforeFinish(span); scope.close(); span.finish(); - streamTaskContext.setAgentScope(null); + streamTaskContext.setScope(null); } } } diff --git a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java index 3e2009cdf8b..e1f6a8f5b3c 100644 --- a/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java +++ b/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/src/main/java/datadog/trace/instrumentation/kafka_streams/StreamTaskContext.java @@ -1,19 +1,19 @@ package datadog.trace.instrumentation.kafka_streams; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; public class StreamTaskContext { - private AgentScope agentScope; + private ContextScope scope; private String applicationId; public StreamTaskContext() {} - public void setAgentScope(AgentScope agentScope) { - this.agentScope = agentScope; + public void setScope(ContextScope scope) { + this.scope = scope; } - public AgentScope getAgentScope() { - return agentScope; + public ContextScope getScope() { + return scope; } public void setApplicationId(String applicationId) { 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 9142797a4ee..f1f7ff69c47 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -25,8 +25,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.4=compileClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/karate/karate-1.0/gradle.lockfile b/dd-java-agent/instrumentation/karate/karate-1.0/gradle.lockfile index 8fb0ca1ec6e..8c1210c580f 100644 --- a/dd-java-agent/instrumentation/karate/karate-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate/karate-1.0/gradle.lockfile @@ -16,7 +16,7 @@ com.aayushatharva.brotli4j:service:1.18.0=latestDepTestRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -35,8 +35,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,karate131TestAnnotationProcessor,karate141TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -177,8 +177,8 @@ io.sqreen:libsqreen:17.5.0=karate131TestRuntimeClasspath,karate141TestRuntimeCla javax.servlet:javax.servlet-api:3.1.0=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:1.2=compileClasspath @@ -268,7 +268,6 @@ org.junit.platform:junit-platform-runner:1.14.1=karate131TestRuntimeClasspath,ka org.junit.platform:junit-platform-suite-api:1.14.1=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.latencyutils:LatencyUtils:2.0.3=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=karate131TestRuntimeClasspath,karate141TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=karate131TestCompileClasspath,karate131TestRuntimeClasspath,karate141TestCompileClasspath,karate141TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/karate/karate-2.0/gradle.lockfile b/dd-java-agent/instrumentation/karate/karate-2.0/gradle.lockfile index 27793e36860..22c908d04c9 100644 --- a/dd-java-agent/instrumentation/karate/karate-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/karate/karate-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -74,8 +74,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,main_java21CompileClasspath,main_java21RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.minidev:accessors-smart:2.6.0=main_java21CompileClasspath,testCompileClasspath,testRuntimeClasspath @@ -128,7 +128,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 b0b4e57e6d4..07ef7345bef 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestIm com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,compileOnlyDependenciesMetadata,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileOnlyDependenciesMetadata,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClas javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesApiDependenciesMetadata,testFixturesCompileClasspath,testFixturesImplementationDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -123,7 +123,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testImplementationDependenciesMetadata,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesCompileOnlyDependenciesMetadata,testFixturesRuntimeClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt index 75a66319120..b29b0c3a19e 100644 --- a/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt +++ b/dd-java-agent/instrumentation/kotlin-coroutines-1.3/src/testFixtures/kotlin/datadog/trace/instrumentation/kotlin/coroutines/CoreKotlinCoroutineTests.kt @@ -372,8 +372,11 @@ abstract class CoreKotlinCoroutineTests(private val dispatcher: CoroutineDispatc protected suspend fun AgentSpan.activateAndUse(block: suspend () -> Unit) { try { - get().activateManualSpan(this).use { + val scope = get().activateManualSpan(this) + try { block() + } finally { + scope.close() } } finally { finish() 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 3c3d0f7e23b..5cdb0254db1 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -25,8 +25,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -72,8 +72,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -116,7 +116,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java index 338222cfbc0..d5ffcc60dc7 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/InstrumentationPoints.java @@ -10,6 +10,7 @@ import static com.lambdaworks.redis.protocol.CommandType.SHUTDOWN; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.lettuce4.LettuceClientDecorator.DECORATE; import static datadog.trace.instrumentation.lettuce4.LettuceClientDecorator.REDIS_CLIENT; @@ -18,7 +19,7 @@ import com.lambdaworks.redis.protocol.CommandType; import com.lambdaworks.redis.protocol.ProtocolKeyword; import com.lambdaworks.redis.protocol.RedisCommand; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.EnumSet; import java.util.Set; @@ -33,7 +34,7 @@ public final class InstrumentationPoints { public static final String AGENT_CRASHING_COMMAND_PREFIX = "COMMAND-NAME:"; - public static AgentScope beforeCommand( + public static ContextScope beforeCommand( final RedisCommand command, final RedisURI redisURI) { final AgentSpan span = startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); @@ -45,10 +46,10 @@ public static AgentScope beforeCommand( public static void afterCommand( final RedisCommand command, - final AgentScope scope, + final ContextScope scope, final Throwable throwable, final AsyncCommand asyncCommand) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); @@ -78,7 +79,7 @@ public static void afterCommand( // span may be finished by handleAsync call above. } - public static AgentScope beforeConnect(final RedisURI redisURI) { + public static ContextScope beforeConnect(final RedisURI redisURI) { final AgentSpan span = startSpan(REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); @@ -87,8 +88,8 @@ public static AgentScope beforeConnect(final RedisURI redisURI) { return activateSpan(span); } - public static void afterConnect(final AgentScope scope, final Throwable throwable) { - final AgentSpan span = scope.span(); + public static void afterConnect(final ContextScope scope, final Throwable throwable) { + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java index 22192ea31dd..0f7656fd81b 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/LettuceAsyncCommandsAdvice.java @@ -5,14 +5,14 @@ import com.lambdaworks.redis.api.StatefulConnection; import com.lambdaworks.redis.protocol.AsyncCommand; import com.lambdaworks.redis.protocol.RedisCommand; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import net.bytebuddy.asm.Advice; public class LettuceAsyncCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final RedisCommand command, @Advice.This AbstractRedisAsyncCommands thiz) { return InstrumentationPoints.beforeCommand( @@ -24,7 +24,7 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( @Advice.Argument(0) final RedisCommand command, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final AsyncCommand asyncCommand) { InstrumentationPoints.afterCommand(command, scope, throwable, asyncCommand); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java index 64fb6b8d123..905132a1faa 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-4.0/src/main/java/datadog/trace/instrumentation/lettuce4/RedisConnectionAdvice.java @@ -3,21 +3,21 @@ import com.lambdaworks.redis.RedisURI; import com.lambdaworks.redis.api.StatefulConnection; import com.lambdaworks.redis.api.StatefulRedisConnection; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import net.bytebuddy.asm.Advice; public class RedisConnectionAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisURI) { + public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisURI) { return InstrumentationPoints.beforeConnect(redisURI); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( @Advice.Argument(1) final RedisURI redisURI, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final StatefulRedisConnection connection) { if (connection != null) { 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 4f638792feb..14f2768a709 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/build.gradle @@ -28,7 +28,14 @@ dependencies { testImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.0.0.RELEASE' testImplementation project(':dd-java-agent:instrumentation:reactor-core-3.1') testImplementation project(':dd-java-agent:instrumentation:reactive-streams-1.0') - + // Needed for tests using Lettuce 5.1.0 -> Reactor 3.2.0, 6.0.0 -> 3.3.10, and 6.1.0 -> 3.3.15. + // Reinstalling the agent retransforms Reactor classes loaded by earlier tests, + // including MonoMetrics/FluxMetrics and their fuseable variants. + // Without micrometer-core, verification fails when resolving CompositeMeterRegistry as a subtype + // of MeterRegistry, for the affected reactor versions, resulting in flaky tests. + // Retries start in a fresh JVM and avoid retransformation of these classes; + // initial class loading can defer this check while metrics remain unused. + testRuntimeOnly 'io.micrometer:micrometer-core:1.6.5' latestDepTestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '+' lettuce51TestImplementation group: 'io.lettuce', name: 'lettuce-core', version: '5.1.0.RELEASE' 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 af6d8d69d2b..ede4a206d0c 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,latestDepForkedTestCompil com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath @@ -30,8 +30,8 @@ com.github.jnr:jnr-ffi:2.2.19=jmhRuntimeClasspath,latestDepForkedTestRuntimeClas com.github.jnr:jnr-posix:3.1.22=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-unixsocket:0.38.25=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath com.github.jnr:jnr-x86asm:1.0.2=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jmhCompileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,lettuce51TestAnnotationProcessor,lettuce51TestCompileClasspath,lettuce60TestAnnotationProcessor,lettuce60TestCompileClasspath,lettuce61TestAnnotationProcessor,lettuce61TestCompileClasspath,lettuce62TestAnnotationProcessor,lettuce62TestCompileClasspath,testAnnotationProcessor,testCompileClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,lettuce51TestAnnotationProcessor,lettuce60TestAnnotationProcessor,lettuce61TestAnnotationProcessor,lettuce62TestAnnotationProcessor,testAnnotationProcessor @@ -68,6 +68,7 @@ io.lettuce:lettuce-core:6.0.0.RELEASE=lettuce60TestCompileClasspath,lettuce60Tes io.lettuce:lettuce-core:6.1.0.RELEASE=lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath io.lettuce:lettuce-core:6.2.0.RELEASE=lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath io.lettuce:lettuce-core:7.7.0.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.6.5=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.15.Final=compileClasspath,jmh,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.29.Final=lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath io.netty:netty-buffer:4.1.52.Final=lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath @@ -118,8 +119,8 @@ io.sqreen:libsqreen:17.5.0=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspa javax.servlet:javax.servlet-api:3.1.0=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=jmh,jmhCompileClasspath,jmhRuntimeClasspath @@ -153,6 +154,7 @@ org.dom4j:dom4j:2.2.0=spotbugs org.gmetrics:GMetrics:2.1.0=codenarc org.hamcrest:hamcrest-core:1.3=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest:3.0=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hdrhistogram:HdrHistogram:2.1.12=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core:4.0.6=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.jetbrains:annotations:17.0.0=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -168,7 +170,7 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,latestDepFor org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs +org.latencyutils:LatencyUtils:2.0.3=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,lettuce51TestRuntimeClasspath,lettuce60TestRuntimeClasspath,lettuce61TestRuntimeClasspath,lettuce62TestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,lettuce51TestCompileClasspath,lettuce51TestRuntimeClasspath,lettuce60TestCompileClasspath,lettuce60TestRuntimeClasspath,lettuce61TestCompileClasspath,lettuce61TestRuntimeClasspath,lettuce62TestCompileClasspath,lettuce62TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.36=jmh,jmhCompileClasspath,jmhRuntimeClasspath diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java new file mode 100644 index 00000000000..cc6b1fb25e5 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ClusterConnectionContextFunction.java @@ -0,0 +1,53 @@ +package datadog.trace.instrumentation.lettuce5; + +import datadog.trace.bootstrap.ContextStore; +import io.lettuce.core.ConnectionFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulConnection; +import java.net.InetSocketAddress; +import java.net.SocketAddress; +import java.util.function.Function; + +public class ClusterConnectionContextFunction + implements Function { + + private final ConnectionFuture connectionFuture; + private final ContextStore contextStore; + + public ClusterConnectionContextFunction( + final ConnectionFuture connectionFuture, + final ContextStore contextStore) { + this.connectionFuture = connectionFuture; + this.contextStore = contextStore; + } + + @Override + public T apply(final T connection) { + if (connection == null) { + return null; + } + + try { + final RedisURI connectionURI = redisUriFromConnectionFuture(); + if (connectionURI != null) { + contextStore.put(connection, connectionURI); + } + } catch (final Throwable ignored) { + } + return connection; + } + + private RedisURI redisUriFromConnectionFuture() { + if (connectionFuture == null) { + return null; + } + + final SocketAddress socketAddress = connectionFuture.getRemoteAddress(); + if (socketAddress instanceof InetSocketAddress) { + final InetSocketAddress inetSocketAddress = (InetSocketAddress) socketAddress; + return RedisURI.create(inetSocketAddress.getHostString(), inetSocketAddress.getPort()); + } + + return null; + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java index fd9c335af54..7c468f73b92 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/ConnectionFutureAdvice.java @@ -2,10 +2,11 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.lettuce.core.ConnectionFuture; import io.lettuce.core.RedisURI; @@ -14,7 +15,7 @@ public class ConnectionFutureAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisUri) { + public static ContextScope onEnter(@Advice.Argument(1) final RedisURI redisUri) { final AgentSpan span = startSpan( LettuceClientDecorator.REDIS_CLIENT.toString(), LettuceClientDecorator.OPERATION_NAME); @@ -26,12 +27,12 @@ public static AgentScope onEnter(@Advice.Argument(1) final RedisURI redisUri) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Argument(1) final RedisURI redisUri, @Advice.Return(readOnly = false) ConnectionFuture connectionFuture) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java index 8c201abd048..2018dcd1a9c 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceAsyncCommandsAdvice.java @@ -2,11 +2,12 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.lettuce.core.AbstractRedisAsyncCommands; import io.lettuce.core.RedisURI; @@ -18,7 +19,7 @@ public class LettuceAsyncCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final RedisCommand command, @Advice.This final AbstractRedisAsyncCommands thiz) { @@ -38,11 +39,11 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( @Advice.Argument(0) final RedisCommand command, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return AsyncCommand asyncCommand) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java index 005d3b8bb6f..3240eea74bd 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/LettuceReactiveClientInstrumentation.java @@ -66,6 +66,7 @@ public String[] helperClassNames() { return new String[] { packageName + ".rx.RedisSubscriptionSubscribeAdvice", packageName + ".rx.RedisSubscriptionSubscribeAdvice$State", + packageName + ".rx.RedisSubscriptionDispatchAdvice", packageName + ".rx.RedisSubscriptionState", packageName + ".LettuceInstrumentationUtil", packageName + ".LettuceClientDecorator", @@ -88,6 +89,11 @@ public Map contextStore() { public void methodAdvice(MethodTransformer transformer) { transformer.applyAdvice( isMethod().and(named("subscribe")), packageName + ".rx.RedisSubscriptionSubscribeAdvice"); + transformer.applyAdvice( + isMethod() + .and(isDeclaredBy(named("io.lettuce.core.RedisPublisher$RedisSubscription"))) + .and(named("dispatchCommand")), + packageName + ".rx.RedisSubscriptionDispatchAdvice"); transformer.applyAdvice( isMethod().and(named("onNext")), packageName + ".rx.RedisSubscriptionAdvanceAdvice"); transformer.applyAdvice( 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 index 39261f49eb1..3a33fedddc7 100644 --- 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 @@ -7,7 +7,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags; import io.lettuce.core.RedisURI; import io.lettuce.core.api.StatefulConnection; -import java.util.function.BiConsumer; +import java.util.concurrent.CompletableFuture; public final class MasterReplicaConnectionHelper { @@ -31,8 +31,22 @@ public static void onConnection( } } - public static BiConsumer onConnectionComplete( - final AgentSpan span, final ContextStore contextStore) { - return (connection, _throwable) -> onConnection(span, connection, contextStore); + public static CompletableFuture onConnectionFuture( + final AgentSpan span, + final CompletableFuture connectionFuture, + final ContextStore contextStore) { + if (connectionFuture.isDone()) { + if (!connectionFuture.isCompletedExceptionally() && !connectionFuture.isCancelled()) { + onConnection(span, connectionFuture.getNow(null), contextStore); + } + return connectionFuture; + } + + return connectionFuture.whenComplete( + (connection, throwable) -> { + if (throwable == null) { + 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 index e0f93f7bc20..cfa04bab42b 100644 --- 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 @@ -98,16 +98,18 @@ public static void onExit(@Advice.Return final StatefulRedisConnection con public static class AsyncAdvice { @Advice.OnMethodExit(suppress = Throwable.class) - public static void onExit( - @Advice.Return final CompletableFuture connectionFuture) { + public static void onExit( + @Advice.Return(readOnly = false) CompletableFuture connectionFuture) { final AgentSpan span = activeSpan(); if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) { return; } - connectionFuture.whenComplete( - MasterReplicaConnectionHelper.onConnectionComplete( - span, InstrumentationContext.get(StatefulConnection.class, RedisURI.class))); + connectionFuture = + MasterReplicaConnectionHelper.onConnectionFuture( + span, + connectionFuture, + InstrumentationContext.get(StatefulConnection.class, RedisURI.class)); } } } diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java new file mode 100644 index 00000000000..d9920b27249 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/PooledClusterConnectionProviderInstrumentation.java @@ -0,0 +1,88 @@ +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.takesArgument; +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 java.util.Collections; +import java.util.Map; +import java.util.concurrent.CompletableFuture; +import net.bytebuddy.asm.Advice; + +/** + * Decorates Redis cluster command spans with the physical node selected for the command key slot. + * + *

Cluster command spans are started before Lettuce resolves the slot owner and applies {@code + * ReadFrom}. This tracks the {@link RedisURI} of physical cluster node connections, then tags the + * active command span when Lettuce returns the selected connection. + */ +@AutoService(InstrumenterModule.class) +public class PooledClusterConnectionProviderInstrumentation extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + public PooledClusterConnectionProviderInstrumentation() { + super("lettuce", "lettuce-5"); + } + + @Override + public String instrumentedType() { + return "io.lettuce.core.cluster.PooledClusterConnectionProvider"; + } + + @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) { + transformer.applyAdvice( + isMethod() + .and(isPublic()) + // Synchronous getConnection delegates here after resolving the command slot. + .and(named("getConnectionAsync")) + .and(takesArguments(2)) + .and(takesArgument(1, int.class)) + .and(returns(named("java.util.concurrent.CompletableFuture"))), + PooledClusterConnectionProviderInstrumentation.class.getName() + "$ConnectionAdvice"); + } + + public static class ConnectionAdvice { + + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit( + @Advice.Return(readOnly = false) CompletableFuture connectionFuture) { + final AgentSpan span = activeSpan(); + if (!MasterReplicaConnectionHelper.isRedisClientSpan(span) || connectionFuture == null) { + return; + } + + connectionFuture = + MasterReplicaConnectionHelper.onConnectionFuture( + span, + connectionFuture, + InstrumentationContext.get(StatefulConnection.class, RedisURI.class)); + } + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java new file mode 100644 index 00000000000..b4d72219af5 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/RedisClusterClientInstrumentation.java @@ -0,0 +1,71 @@ +package datadog.trace.instrumentation.lettuce5; + +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.takesArgument; +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 io.lettuce.core.ConnectionFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.api.StatefulConnection; +import java.util.Collections; +import java.util.Map; +import net.bytebuddy.asm.Advice; + +@AutoService(InstrumenterModule.class) +public class RedisClusterClientInstrumentation extends InstrumenterModule.Tracing + implements Instrumenter.ForSingleType, Instrumenter.HasMethodAdvice { + + public RedisClusterClientInstrumentation() { + super("lettuce", "lettuce-5"); + } + + @Override + public String instrumentedType() { + return "io.lettuce.core.cluster.RedisClusterClient"; + } + + @Override + public Map contextStore() { + return Collections.singletonMap( + "io.lettuce.core.api.StatefulConnection", "io.lettuce.core.RedisURI"); + } + + @Override + public String[] helperClassNames() { + return new String[] {packageName + ".ClusterConnectionContextFunction"}; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + isMethod() + .and(named("connectToNodeAsync")) + .and(takesArguments(4)) + .and(takesArgument(1, String.class)) + .and(returns(named("io.lettuce.core.ConnectionFuture"))), + RedisClusterClientInstrumentation.class.getName() + "$ConnectToNodeAdvice"); + } + + public static class ConnectToNodeAdvice { + + @Advice.OnMethodExit(suppress = Throwable.class) + public static void onExit( + @Advice.Return(readOnly = false) ConnectionFuture connectionFuture) { + if (connectionFuture == null) { + return; + } + + connectionFuture = + connectionFuture.thenApply( + new ClusterConnectionContextFunction( + connectionFuture, + InstrumentationContext.get(StatefulConnection.class, RedisURI.class))); + } + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java new file mode 100644 index 00000000000..8efd5f75325 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionDispatchAdvice.java @@ -0,0 +1,27 @@ +package datadog.trace.instrumentation.lettuce5.rx; + +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; + +import datadog.context.ContextScope; +import datadog.trace.bootstrap.InstrumentationContext; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import io.lettuce.core.protocol.RedisCommand; +import net.bytebuddy.asm.Advice; + +public class RedisSubscriptionDispatchAdvice { + + @Advice.OnMethodEnter(suppress = Throwable.class) + public static ContextScope beforeDispatch( + @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) { + AgentSpan span = + InstrumentationContext.get(RedisCommand.class, AgentSpan.class).get(subscriptionCommand); + return span != null ? activateSpan(span) : null; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void afterDispatch(@Advice.Enter ContextScope scope) { + if (scope != null) { + scope.close(); + } + } +} diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java index d10800f5d94..4f7124e35a6 100644 --- a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/main/java/datadog/trace/instrumentation/lettuce5/rx/RedisSubscriptionSubscribeAdvice.java @@ -5,8 +5,8 @@ import static datadog.trace.instrumentation.lettuce5.LettuceClientDecorator.DECORATE; import static datadog.trace.instrumentation.lettuce5.LettuceInstrumentationUtil.expectsResponse; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.instrumentation.lettuce5.LettuceClientDecorator; import io.lettuce.core.RedisURI; @@ -17,10 +17,10 @@ public class RedisSubscriptionSubscribeAdvice { public static final class State { - public final AgentScope parentScope; + public final ContextScope parentScope; public final AgentSpan span; - public State(AgentScope parentScope, AgentSpan span) { + public State(ContextScope parentScope, AgentSpan span) { this.parentScope = parentScope; this.span = span; } @@ -32,7 +32,7 @@ public static State beforeSubscribe( @Advice.FieldValue("command") RedisCommand command, @Advice.FieldValue("subscriptionCommand") RedisCommand subscriptionCommand) { - AgentScope parentScope = null; + ContextScope parentScope = null; RedisSubscriptionState state = (RedisSubscriptionState) InstrumentationContext.get( diff --git a/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java new file mode 100644 index 00000000000..ccefb34e0b7 --- /dev/null +++ b/dd-java-agent/instrumentation/lettuce/lettuce-5.0/src/test/java/Lettuce5ClusterTest.java @@ -0,0 +1,300 @@ +import static datadog.trace.agent.test.utils.PortUtils.randomOpenPort; +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.fail; + +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.bootstrap.instrumentation.api.Tags; +import datadog.trace.core.DDSpan; +import datadog.trace.test.util.PollingConditions; +import io.lettuce.core.ReadFrom; +import io.lettuce.core.RedisFuture; +import io.lettuce.core.RedisURI; +import io.lettuce.core.cluster.ClusterClientOptions; +import io.lettuce.core.cluster.RedisClusterClient; +import io.lettuce.core.cluster.SlotHash; +import io.lettuce.core.cluster.api.StatefulRedisClusterConnection; +import io.lettuce.core.cluster.models.partitions.RedisClusterNode; +import java.util.ArrayList; +import java.util.Arrays; +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.GenericContainer; +import org.testcontainers.containers.wait.strategy.Wait; + +class Lettuce5ClusterTest extends AbstractInstrumentationTest { + private static final String TEST_SET_KEY = "TESTSETKEY"; + private static final String TEST_SET_VALUE = "TESTSETVAL"; + private static final int MAX_TCP_PORT = 65535; + private static final int CLUSTER_BUS_PORT_OFFSET = 10000; + private static final int MAX_CLUSTER_DATA_PORT = MAX_TCP_PORT - CLUSTER_BUS_PORT_OFFSET; + + private GenericContainer redisCluster; + private RedisClusterClient redisClient; + private StatefulRedisClusterConnection connection; + private int redisClusterMasterPort; + private int redisClusterReplicaPort; + + @BeforeEach + void setUpRedis() throws Exception { + redisClusterMasterPort = randomClusterPort(MAX_CLUSTER_DATA_PORT); + redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT); + while (redisClusterMasterPort == redisClusterReplicaPort + || redisClusterMasterPort + CLUSTER_BUS_PORT_OFFSET == redisClusterReplicaPort + || redisClusterReplicaPort + CLUSTER_BUS_PORT_OFFSET == redisClusterMasterPort) { + redisClusterReplicaPort = randomClusterPort(MAX_CLUSTER_DATA_PORT); + } + + // Redis cluster discovery returns the announced node port, so the host-side port must be + // stable. Use the same random ports inside the container so cluster nodes can also reach each + // other at their announced addresses. + redisCluster = new GenericContainer<>("redis:6.2.6"); + redisCluster.setPortBindings( + Arrays.asList( + redisClusterMasterPort + ":" + redisClusterMasterPort, + redisClusterReplicaPort + ":" + redisClusterReplicaPort)); + redisCluster + .withExposedPorts(redisClusterMasterPort, redisClusterReplicaPort) + .withCommand( + "sh", "-c", redisClusterCommand(redisClusterMasterPort, redisClusterReplicaPort)) + .waitingFor(Wait.forLogMessage(".*CLUSTER_READY.*\\n", 1)); + redisCluster.start(); + + RedisURI redisURI = + RedisURI.Builder.redis(redisCluster.getHost(), redisClusterMasterPort).build(); + redisClient = RedisClusterClient.create(redisURI); + redisClient.setOptions(ClusterClientOptions.builder().build()); + connection = redisClient.connect(); + new PollingConditions(30) + .delay(0.5) + .eventually( + () -> + assertEquals( + "OK", + connection.sync().set("DD_CLUSTER_READY", "1"), + "Redis cluster did not become ready")); + + tracer.flush(); + writer.clear(); + } + + @AfterEach + void cleanUpRedis() { + if (connection != null) { + connection.close(); + } + + if (redisClient != null) { + redisClient.shutdown(5, 10, TimeUnit.SECONDS); + } + + if (redisCluster != null) { + redisCluster.close(); + } + } + + @Test + void clusterCommandSpanHasPeerHostname() throws Exception { + String result = connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE); + + assertEquals("OK", result); + assertSetSpanHasPeerHostname(); + } + + @Test + void asyncClusterCommandSpanHasPeerHostname() throws Exception { + RedisFuture redisFuture = connection.async().set(TEST_SET_KEY, TEST_SET_VALUE); + String result = redisFuture.get(3, TimeUnit.SECONDS); + + assertEquals("OK", result); + assertSetSpanHasPeerHostname(); + } + + @Test + void reactiveClusterCommandSpanHasPeerHostname() { + String result = connection.reactive().set(TEST_SET_KEY, TEST_SET_VALUE).block(); + + assertEquals("OK", result); + assertSetSpanHasPeerHostname(); + } + + @Test + void clusterReadCommandSpanUsesReplicaPeerWithReadFromReplica() throws Exception { + assertEquals("OK", connection.sync().set(TEST_SET_KEY, TEST_SET_VALUE)); + connection.setReadFrom(ReadFrom.SLAVE); + new PollingConditions(30) + .delay(0.5) + .eventually( + () -> { + redisClient.reloadPartitions(); + assertEquals(TEST_SET_VALUE, connection.sync().get(TEST_SET_KEY)); + }); + + blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty()); + tracer.flush(); + writer.clear(); + + String result = connection.sync().get(TEST_SET_KEY); + + assertEquals(TEST_SET_VALUE, result); + assertGetSpanHasReplicaPeer(); + } + + private void assertSetSpanHasPeerHostname() { + blockUntilTracesMatch(traces -> !findCommandSpans(traces, "SET").isEmpty()); + + RedisClusterNode expectedNode = + connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY)); + assertNotNull(expectedNode, "expected a cluster node for the command key slot"); + + List setSpans = findCommandSpans(writer, "SET"); + assertFalse(setSpans.isEmpty(), "expected at least one SET command span"); + for (DDSpan span : setSpans) { + 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(expectedNode.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME)); + } + } + + private void assertGetSpanHasReplicaPeer() { + blockUntilTracesMatch(traces -> !findCommandSpans(traces, "GET").isEmpty()); + + RedisClusterNode master = + connection.getPartitions().getPartitionBySlot(SlotHash.getSlot(TEST_SET_KEY)); + assertNotNull(master, "expected a cluster master node for the command key slot"); + + RedisClusterNode replica = findReplicaOf(master); + assertNotNull(replica, "expected a replica for the command key slot"); + assertNotEquals( + master.getUri().getPort(), + replica.getUri().getPort(), + "test must use different master and replica endpoints"); + + List getSpans = findCommandSpans(writer, "GET"); + assertFalse(getSpans.isEmpty(), "expected at least one GET command span"); + for (DDSpan span : getSpans) { + assertEquals("GET", String.valueOf(span.getResourceName())); + assertEquals("redis-client", String.valueOf(span.getTag(Tags.COMPONENT))); + assertEquals("redis", span.getTag(Tags.DB_TYPE)); + assertEquals(replica.getUri().getPort(), span.getTag(Tags.PEER_PORT)); + assertEquals(replica.getUri().getHost(), span.getTag(Tags.PEER_HOSTNAME)); + } + } + + private RedisClusterNode findReplicaOf(RedisClusterNode master) { + for (RedisClusterNode node : connection.getPartitions()) { + if (master.getNodeId().equals(node.getSlaveOf())) { + return node; + } + } + fail("No replica found for master " + master); + return null; + } + + private static List findCommandSpans(Iterable> traces, String command) { + List commandSpans = new ArrayList<>(); + for (List trace : traces) { + for (DDSpan span : trace) { + if (command.contentEquals(span.getResourceName()) + && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) { + commandSpans.add(span); + } + } + } + return commandSpans; + } + + private static int randomClusterPort(int maxPort) { + int port = randomOpenPort(); + while (port > maxPort) { + port = randomOpenPort(); + } + return port; + } + + private static String redisClusterCommand(int masterPort, int replicaPort) { + return "set -e; " + + "mkdir -p /tmp/redis-cluster; " + // Start the slot-owning master on its announced data and cluster bus ports. + + "redis-server --port " + + masterPort + + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-" + + masterPort + + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no" + + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port " + + masterPort + + " --cluster-announce-bus-port " + + (masterPort + CLUSTER_BUS_PORT_OFFSET) + + " --daemonize yes; " + // Start the replica on its own announced data and cluster bus ports. + + "redis-server --port " + + replicaPort + + " --dir /tmp/redis-cluster --cluster-enabled yes --cluster-config-file nodes-" + + replicaPort + + ".conf --cluster-node-timeout 5000 --appendonly no --protected-mode no" + + " --cluster-announce-ip 127.0.0.1 --cluster-announce-port " + + replicaPort + + " --cluster-announce-bus-port " + + (replicaPort + CLUSTER_BUS_PORT_OFFSET) + + " --daemonize yes; " + // Wait until both Redis server processes accept commands. + + "until redis-cli -p " + + masterPort + + " ping; do sleep 0.1; done; " + + "until redis-cli -p " + + replicaPort + + " ping; do sleep 0.1; done; " + // Assign every slot to one master so the test cluster is valid with a single shard. + + "redis-cli -p " + + masterPort + + " cluster addslots $(seq 0 16383); " + // Introduce the replica node to the master's cluster view. + + "redis-cli -p " + + replicaPort + + " cluster meet 127.0.0.1 " + + masterPort + + "; " + // Capture stable node IDs needed for replication checks. + + "master_id=$(redis-cli -p " + + masterPort + + " cluster myid); " + + "replica_id=$(redis-cli -p " + + replicaPort + + " cluster myid); " + // Wait until the replica sees the master before requesting replication. + + "until redis-cli -p " + + replicaPort + + " cluster nodes | grep \"$master_id\"; do sleep 0.1; done; " + // Convert the second node into a replica of the slot-owning master. + + "redis-cli -p " + + replicaPort + + " cluster replicate \"$master_id\"; " + // Wait until the master's cluster view records the replica relationship. + + "until redis-cli -p " + + masterPort + + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q slave; do sleep 0.1; done; " + // Wait until the replica's local cluster view records its replica role. + + "until redis-cli -p " + + replicaPort + + " cluster nodes | grep \"$replica_id\" | grep \"$master_id\" | grep -q myself,slave; do sleep 0.1; done; " + // Wait until Redis reports the process role as replica. + + "until redis-cli -p " + + replicaPort + + " role | grep -q slave; do sleep 0.1; done; " + // Wait until the cluster is usable before releasing the Testcontainers wait strategy. + + "until redis-cli -p " + + masterPort + + " cluster info | grep -q cluster_state:ok; do sleep 0.1; done; " + // Signal readiness to the Java test. + + "echo CLUSTER_READY; " + // Keep the container alive for the duration of the test. + + "tail -f /dev/null"; + } +} 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 index 40d8564e34c..0b1e0a1c3f3 100644 --- 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 @@ -71,10 +71,25 @@ void staticMasterReplicaCommandSpanHasPeerHostname() throws Exception { String result = connection.sync().set("TESTSETKEY", "TESTSETVAL"); assertEquals("OK", result); - writer.waitForTraces(1); + List setSpans = waitForSetSpans(); + 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)); + } + + private List waitForSetSpans() { + blockUntilTracesMatch(traces -> !findSetSpans(traces).isEmpty()); + return findSetSpans(writer); + } + + private static List findSetSpans(Iterable> traces) { List setSpans = new ArrayList<>(); - for (List trace : writer) { + for (List trace : traces) { for (DDSpan span : trace) { if ("SET".contentEquals(span.getResourceName()) && "redis-client".equals(String.valueOf(span.getTag(Tags.COMPONENT)))) { @@ -82,14 +97,7 @@ void staticMasterReplicaCommandSpanHasPeerHostname() throws Exception { } } } - - 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)); + return setSpans; } @SuppressWarnings("unchecked") 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 f247191d15d..481ab4c9ef2 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-20.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testLogging,webappCompil com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ javax.servlet:javax.servlet-api:3.0.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath 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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.opentest4j:opentest4j:1.3.0=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 ead506f3250..5d58d39fcb3 100644 --- a/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/liberty/liberty-23.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testLogging,webappCompil com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ jakarta.servlet:jakarta.servlet-api:5.0.0=compileClasspath,webappCompileClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,webappCompileClasspath 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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath,webappCompileClasspath org.opentest4j:opentest4j:1.3.0=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 7aa9d49022c..50527061177 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.17=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath log4j:log4j:1.2.4=compileClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0df8f3bff53..c48f8a7499f 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 deb091fd541..4d9871e8ba9 100644 --- a/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/log4j/log4j-2.7/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 8db5414e6a0..244c8fa3d7c 100644 --- a/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/logback-1.0/gradle.lockfile @@ -11,7 +11,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -24,8 +24,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 4559494c712..2b75526186a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=compileClasspath,latestDepTestCompileClasspa javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5bc14ef377a..a9991d29c67 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ javax.mail:javax.mail-api:1.4.4=compileClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle b/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle index 2023f3de408..8e7cf5c6fed 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/build.gradle @@ -13,6 +13,13 @@ muzzle { addTestSuiteForDir('latestDepTest', 'test') +def mavenRepositoryProxy = providers.gradleProperty('mavenRepositoryProxy') +tasks.withType(Test).configureEach { + if (mavenRepositoryProxy.isPresent()) { + environment 'MAVEN_REPOSITORY_PROXY', mavenRepositoryProxy.get() + } +} + dependencies { compileOnly 'org.apache.maven:maven-embedder:3.2.1' 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 5ce44a1c0b1..36e5bfc2886 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 @@ -12,7 +12,7 @@ ch.qos.logback:logback-core:1.3.16=latestDepTestRuntimeClasspath 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-instrument-java:0.0.5=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 @@ -29,8 +29,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -75,8 +75,8 @@ javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,lates javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -94,18 +94,18 @@ org.apache.httpcomponents:httpcore:4.4.16=latestDepTestCompileClasspath,latestDe org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.maven.resolver:maven-resolver-api:1.0.3=testCompileClasspath,testRuntimeClasspath -org.apache.maven.resolver:maven-resolver-api:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.maven.resolver:maven-resolver-api:2.0.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-connector-basic:1.0.3=testCompileClasspath,testRuntimeClasspath -org.apache.maven.resolver:maven-resolver-connector-basic:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.maven.resolver:maven-resolver-connector-basic:2.0.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-impl:2.0.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-named-locks:2.0.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-spi:1.0.3=testCompileClasspath,testRuntimeClasspath -org.apache.maven.resolver:maven-resolver-spi:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.maven.resolver:maven-resolver-spi:2.0.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-supplier-mvn3:2.0.20=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.maven.resolver:maven-resolver-transport-apache:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.maven.resolver:maven-resolver-transport-apache:2.0.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.resolver:maven-resolver-transport-http:1.0.3=testCompileClasspath,testRuntimeClasspath org.apache.maven.resolver:maven-resolver-util:1.0.3=testCompileClasspath,testRuntimeClasspath -org.apache.maven.resolver:maven-resolver-util:2.0.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.maven.resolver:maven-resolver-util:2.0.23=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven.wagon:wagon-provider-api:2.8=testRuntimeClasspath org.apache.maven.wagon:wagon-provider-api:3.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.maven:maven-aether-provider:3.2.1=compileClasspath @@ -211,7 +211,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -227,14 +226,15 @@ org.ow2.asm:asm-util:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:2.0.18=latestDepTestRuntimeClasspath +org.slf4j:jcl-over-slf4j:2.0.19=latestDepTestRuntimeClasspath 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=testCompileClasspath org.slf4j:slf4j-api:1.7.36=testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +org.slf4j:slf4j-api:2.0.18=spotbugs +org.slf4j:slf4j-api:2.0.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath org.sonatype.plexus:plexus-cipher:1.7=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy index ad5f991cb41..960d2926937 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/groovy/MavenInstrumentationTest.groovy @@ -40,9 +40,7 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest { } def "test #testcaseName"() { - String workingDirectory = projectFolder.toString() - - def exitCode = new MavenCli().doMain(args.toArray(new String[0]), workingDirectory, null, null) + def exitCode = executeMaven(args) assertEquals(expectedExitCode, exitCode) assertSpansData(testcaseName) @@ -71,10 +69,8 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest { * before proceeding with running the build */ void givenMavenDependenciesAreLoaded() { - String[] args = ["org.apache.maven.plugins:maven-dependency-plugin:go-offline"] - String workingDirectory = projectFolder.toString() for (int attempt = 0; attempt < DEPENDENCIES_DOWNLOAD_RETRIES; attempt++) { - def exitCode = new MavenCli().doMain(args, workingDirectory, null, null) + def exitCode = executeMaven(["org.apache.maven.plugins:maven-dependency-plugin:go-offline"]) if (exitCode == 0) { return } @@ -82,6 +78,15 @@ class MavenInstrumentationTest extends CiVisibilityInstrumentationTest { throw new AssertionError((Object) "Tried to download dependencies $DEPENDENCIES_DOWNLOAD_RETRIES times and failed") } + private int executeMaven(List args) { + def arguments = new ArrayList<>(args) + if (System.getenv("MAVEN_REPOSITORY_PROXY") != null) { + def settingsFile = new File(getClass().getResource("/settings.mirror.xml").toURI()) + arguments.addAll(["-s", settingsFile.absolutePath]) + } + return new MavenCli().doMain(arguments.toArray(new String[0]), projectFolder.toString(), null, null) + } + @Override String instrumentedLibraryName() { return "maven" diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java index 7b06be2d330..5c61e3ea06f 100644 --- a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/java/datadog/trace/instrumentation/maven3/AbstractMavenTest.java @@ -1,10 +1,13 @@ package datadog.trace.instrumentation.maven3; +import static java.util.Collections.addAll; import static org.junit.jupiter.api.Assertions.assertTrue; import java.io.File; import java.io.PrintStream; import java.nio.file.Path; +import java.util.ArrayList; +import java.util.List; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; @@ -51,17 +54,24 @@ protected void customizeContainer(PlexusContainer container) { File pomFile = new File(AbstractMavenTest.class.getResource(pomPath).toURI()); - String[] arguments = new String[additionalArgs.length + 4]; - arguments[0] = "-f"; - arguments[1] = pomFile.getAbsolutePath(); - arguments[2] = goal; + List arguments = new ArrayList<>(); + addAll(arguments, "-f", pomFile.getAbsolutePath(), goal); // Cap Aether's HTTP read timeout so a stalled Maven Central fetch fails fast. // Default is 30 min, which exceeds the 20-min Gradle test task timeout and turns // a network stall into an opaque "Timeout has been exceeded" task abort. - arguments[3] = "-Daether.connector.requestTimeout=60000"; - System.arraycopy(additionalArgs, 0, arguments, 4, additionalArgs.length); + arguments.add("-Daether.connector.requestTimeout=60000"); + if (System.getenv("MAVEN_REPOSITORY_PROXY") != null) { + File settingsFile = + new File(AbstractMavenTest.class.getResource("/settings.mirror.xml").toURI()); + addAll(arguments, "-s", settingsFile.getAbsolutePath()); + } + addAll(arguments, additionalArgs); - mavenCli.doMain(arguments, WORKING_DIRECTORY.toAbsolutePath().toString(), stdOut, stderr); + mavenCli.doMain( + arguments.toArray(new String[0]), + WORKING_DIRECTORY.toAbsolutePath().toString(), + stdOut, + stderr); Exception error = spy.handlerError.get(); if (error != null) { diff --git a/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/settings.mirror.xml b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/settings.mirror.xml new file mode 100644 index 00000000000..7b663052386 --- /dev/null +++ b/dd-java-agent/instrumentation/maven/maven-3.2.1/src/test/resources/settings.mirror.xml @@ -0,0 +1,9 @@ + + + + env-proxy + * + ${env.MAVEN_REPOSITORY_PROXY} + + + 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 9df932778c5..40fdff5a582 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -107,7 +107,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 a6b4f68cafc..b358d4b0fcf 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.spotbugs:spotbugs-annotations:4.0.3=latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -112,8 +112,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.validation:validation-api:2.0.1.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -154,7 +154,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 4f146dc8ef7..09efb15221a 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 @@ -9,22 +9,22 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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-annotations:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.18.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.18.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.18.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.18.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.18.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.12.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.18.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.18.9=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 @@ -34,8 +34,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -64,53 +64,53 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micronaut:micronaut-aop:3.0.0=compileClasspath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-aop:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-aop:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-buffer-netty:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-buffer-netty:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-buffer-netty:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-context:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core-reactive:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core-reactive:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core-reactive:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core:3.0.0=compileClasspath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-client-core:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-client-core:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-client-core:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-netty:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-netty:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-netty:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server-netty:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server-netty:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server-netty:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-inject-java:3.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-inject:3.0.0=compileClasspath,latestDepTestAnnotationProcessor,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-inject:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micronaut:micronaut-jackson-core:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micronaut:micronaut-jackson-databind:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micronaut:micronaut-json-core:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-inject:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-core:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-databind:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-json-core:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-router:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-router:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-router:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-runtime:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-runtime:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-runtime:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-websocket:3.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-websocket:3.10.10=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-buffer:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-websocket:3.10.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.67.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.5.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -123,8 +123,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.validation:validation-api:2.0.1.Final=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -165,7 +165,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5324656fd91..e95a5f0b4e3 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 @@ -9,22 +9,22 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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-annotations:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.22=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.15.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.4=latestDepTestAnnotationProcessor,testAnnotationProcessor com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.javaparser:javaparser-symbol-solver-core:3.25.4=latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -36,8 +36,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -66,56 +66,56 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.micronaut:micronaut-aop:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-aop:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-aop:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-buffer-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-buffer-netty:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-buffer-netty:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context-propagation:4.0.0=testRuntimeClasspath -io.micronaut:micronaut-context-propagation:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context-propagation:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-context:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-context:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-context:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core-processor:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-core-reactive:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core-reactive:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core-reactive:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-core:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-core:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-core:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-netty:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-netty:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server-netty:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server-netty:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server-netty:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http-server:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http-server:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http-server:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-http:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-http:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-http:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-inject-java:4.0.0=latestDepTestAnnotationProcessor,testAnnotationProcessor io.micronaut:micronaut-inject:4.0.0=latestDepTestAnnotationProcessor,main_java17CompileClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-inject:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-inject:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-core:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-core:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-jackson-databind:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-jackson-databind:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-jackson-databind:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-json-core:4.0.0=testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-json-core:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-json-core:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.micronaut:micronaut-router:4.0.0=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.micronaut:micronaut-router:4.10.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micronaut:micronaut-router:4.10.28=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.94.Final=main_java17CompileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.16.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor:reactor-core:3.5.7=latestDepTestCompileClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.7.12=latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -124,8 +124,8 @@ jakarta.inject:jakarta.inject-api:2.0.1=latestDepTestAnnotationProcessor,latestD javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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.10=spotbugs @@ -166,7 +166,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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/ChannelAcceptAdvice.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/ChannelAcceptAdvice.java index fef3a8f016c..498e902b215 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/ChannelAcceptAdvice.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/ChannelAcceptAdvice.java @@ -7,14 +7,14 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.PARENT_SPAN_ATTRIBUTE; 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.server.netty.NettyHttpRequest; import net.bytebuddy.asm.Advice; public class ChannelAcceptAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.FieldValue("nettyRequest") final NettyHttpRequest request) { final AgentSpan nettySpan = activeSpan(); @@ -30,7 +30,7 @@ public static AgentScope beginRequest( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void endRequest(@Advice.Enter final AgentScope scope) { + public static void endRequest(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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/ChannelAcceptAdvice2.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/ChannelAcceptAdvice2.java index 46a24b24336..ccc86cfa320 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/ChannelAcceptAdvice2.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/ChannelAcceptAdvice2.java @@ -7,14 +7,14 @@ import static datadog.trace.instrumentation.micronaut.v4_0.MicronautDecorator.PARENT_SPAN_ATTRIBUTE; 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.server.netty.NettyHttpRequest; import net.bytebuddy.asm.Advice; public class ChannelAcceptAdvice2 { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest(@Advice.Argument(0) final NettyHttpRequest request) { + public static ContextScope beginRequest(@Advice.Argument(0) final NettyHttpRequest request) { final AgentSpan nettySpan = activeSpan(); if (request == null || nettySpan == null) { @@ -29,7 +29,7 @@ public static AgentScope beginRequest(@Advice.Argument(0) final NettyHttpRequest } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void endRequest(@Advice.Enter final AgentScope scope) { + public static void endRequest(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 22de1966e83..e275993a534 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -25,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -81,8 +81,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:2.0.1.Final=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -123,7 +123,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java index 9a2d04b3e85..4643d580e9b 100644 --- a/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java +++ b/dd-java-agent/instrumentation/micronaut/micronaut-http-server-netty/micronaut-http-server-netty-common/src/main/java/datadog/trace/instrumentation/micronaut/ChannelRead0Advice.java @@ -7,14 +7,14 @@ import static datadog.trace.instrumentation.micronaut.MicronautDecorator.PARENT_SPAN_ATTRIBUTE; import static datadog.trace.instrumentation.micronaut.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 net.bytebuddy.asm.Advice; public class ChannelRead0Advice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest(@Advice.Argument(1) final HttpRequest request) { + public static ContextScope beginRequest(@Advice.Argument(1) final HttpRequest request) { final AgentSpan nettySpan = activeSpan(); if (null == nettySpan) { // Micronaut-netty uses Netty so there needs to be a Netty span @@ -29,7 +29,7 @@ public static AgentScope beginRequest(@Advice.Argument(1) final HttpRequest r } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void endRequest(@Advice.Enter final AgentScope scope) { + public static void endRequest(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } diff --git a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile index 54227226ef3..afc59f1407c 100644 --- a/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/mongo/mongo-common/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testFixturesCompileClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=testFixturesRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testFixturesRuntimeClasspath,tes org.junit.platform:junit-platform-suite-api:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.mongodb:mongo-java-driver:3.1.0=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesCompileClasspath,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 305c2248afb..f386ba2aaab 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:mongo-java-driver:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath org.mongodb:mongo-java-driver:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 7aaaff06e0e..2d43bcc8b97 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.4.0=compileClasspath org.mongodb:mongo-java-driver:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 153dc14aefd..ccf1b6c51d2 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.6.0=compileClasspath org.mongodb:mongo-java-driver:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 705ba9af172..f51468351bc 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.8.0=compileClasspath org.mongodb:mongo-java-driver:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 aeec051a85c..fadfcd0432c 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,mongo410ForkedTestAnnotationProcessor,mongo410TestAnnotationProcessor,mongo43ForkedTestAnnotationProcessor,mongo43TestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -105,30 +105,29 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson-record-codec:4.10.2=mongo410ForkedTestRuntimeClasspath,mongo410TestRuntimeClasspath -org.mongodb:bson-record-codec:5.10.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.mongodb:bson-record-codec:5.12.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath org.mongodb:bson:4.0.0=compileClasspath org.mongodb:bson:4.0.1=testCompileClasspath,testRuntimeClasspath org.mongodb:bson:4.10.2=mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath org.mongodb:bson:4.3.4=mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath -org.mongodb:bson:5.10.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mongodb:bson:5.12.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mongodb:mongodb-driver-core:4.0.0=compileClasspath org.mongodb:mongodb-driver-core:4.0.1=testCompileClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-core:4.10.2=mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath org.mongodb:mongodb-driver-core:4.3.4=mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath -org.mongodb:mongodb-driver-core:5.10.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mongodb:mongodb-driver-core:5.12.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mongodb:mongodb-driver-reactivestreams:4.0.0=compileClasspath org.mongodb:mongodb-driver-reactivestreams:4.0.1=testCompileClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-reactivestreams:4.10.2=mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath org.mongodb:mongodb-driver-reactivestreams:4.3.4=mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath -org.mongodb:mongodb-driver-reactivestreams:5.10.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mongodb:mongodb-driver-reactivestreams:5.12.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mongodb:mongodb-driver-sync:4.0.0=compileClasspath org.mongodb:mongodb-driver-sync:4.0.1=testCompileClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-sync:4.10.2=mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath org.mongodb:mongodb-driver-sync:4.3.4=mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath -org.mongodb:mongodb-driver-sync:5.10.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mongodb:mongodb-driver-sync:5.12.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,mongo410ForkedTestCompileClasspath,mongo410ForkedTestRuntimeClasspath,mongo410TestCompileClasspath,mongo410TestRuntimeClasspath,mongo43ForkedTestCompileClasspath,mongo43ForkedTestRuntimeClasspath,mongo43TestCompileClasspath,mongo43TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs 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 93439190d6a..d0ccec37bc8 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mongodb:bson:3.3.0=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 0bda31839ed..bfc07dd751f 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.1.0=testCompileClasspath,testRuntimeClasspath org.mongodb:bson:3.6.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 59e15a5b32a..856528655ba 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mongodb:bson:3.7.0=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 a27aeb57920..7a5680e1f0b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mongodb:bson:3.10.0=testCompileClasspath,testRuntimeClasspath org.mongodb:bson:3.12.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile index 636bbf732c2..c7e40fa5178 100644 --- a/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/mule-4.5/gradle.lockfile @@ -17,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.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -65,9 +65,9 @@ com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,mule46ForkedTe 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.10.3=compileClasspath,spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs com.github.spotbugs:spotbugs-annotations:4.7.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,mule46ForkedTestAnnotationProcessor,testAnnotationProcessor @@ -272,7 +272,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.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=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 @@ -445,7 +445,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,mule46ForkedTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,mule46ForkedTestCompileClasspath,mule46ForkedTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 @@ -726,7 +725,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.12.2=latestMuleServices +org.mule.services:mule-service-scheduler:1.12.3=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/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java index 45dfceb6c9d..9e6c894cc32 100644 --- a/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java +++ b/dd-java-agent/instrumentation/mule-4.5/src/main/java/datadog/trace/instrumentation/mule4/ComponentMessageProcessorInstrumentation.java @@ -8,11 +8,11 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.agent.tooling.annotation.AppliesOn; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import net.bytebuddy.asm.Advice; import org.mule.runtime.api.event.EventContext; import org.mule.runtime.core.api.event.CoreEvent; @@ -43,7 +43,7 @@ public void methodAdvice(MethodTransformer transformer) { @AppliesOn(CONTEXT_TRACKING) public static class ProcessAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before(@Advice.Argument(0) final CoreEvent event) { + public static ContextScope before(@Advice.Argument(0) final CoreEvent event) { if (event == null || event.getContext() == null) { return null; } @@ -56,7 +56,7 @@ public static AgentScope before(@Advice.Argument(0) final CoreEvent event) { } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 e548f5f2a37..290ea2097df 100644 --- a/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-3.8/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -60,8 +60,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 239d399c837..0d717318f12 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -76,8 +76,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -128,7 +128,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java index 33c854fc2ef..bb6b46210ed 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.0/src/main/java/datadog/trace/instrumentation/netty40/NettyChannelHandlerContextInstrumentation.java @@ -14,9 +14,9 @@ import com.google.auto.service.AutoService; import datadog.context.Context; +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 datadog.trace.instrumentation.netty40.client.NettyHttpClientDecorator; import datadog.trace.instrumentation.netty40.server.NettyHttpServerDecorator; @@ -69,7 +69,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class FireAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) { + public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) { final Context storedContext = ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get(); final AgentSpan channelSpan = spanFromContext(storedContext); if (channelSpan == null || channelSpan == activeSpan()) { @@ -80,7 +80,7 @@ public static AgentScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void close(@Advice.Enter final AgentScope scope) { + public static void close(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 4c0172b0afd..ba559417a47 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-4.1/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,55 +56,55 @@ de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,la io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.0.Final=compileClasspath io.netty:netty-buffer:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.19.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.0.Final=compileClasspath io.netty:netty-codec-http2:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.0.Final=compileClasspath io.netty:netty-codec-http:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-marshalling:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-protobuf:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.0.Final=compileClasspath io.netty:netty-codec:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.0.Final=compileClasspath io.netty:netty-common:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.136.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.29.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.0.Final=compileClasspath io.netty:netty-handler:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.19.Final=testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.0.Final=compileClasspath io.netty:netty-resolver:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-epoll:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-classes-kqueue:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-epoll:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-classes-kqueue:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport-native-epoll:4.1.136.Final=latestDepTestCompileClasspath io.netty:netty-transport-native-epoll:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-epoll:4.2.17.Final=latestDepTestRuntimeClasspath +io.netty:netty-transport-native-epoll:4.2.18.Final=latestDepTestRuntimeClasspath io.netty:netty-transport-native-kqueue:4.1.136.Final=latestDepTestCompileClasspath -io.netty:netty-transport-native-kqueue:4.2.17.Final=latestDepTestRuntimeClasspath +io.netty:netty-transport-native-kqueue:4.2.18.Final=latestDepTestRuntimeClasspath io.netty:netty-transport-native-unix-common:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.0.Final=compileClasspath io.netty:netty-transport:4.1.29.Final=testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.projectreactor.netty:reactor-netty:0.8.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.projectreactor:reactor-core:3.2.0.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -149,7 +149,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java index a821b9c9f56..0246d87e69d 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyChannelHandlerContextInstrumentation.java @@ -13,9 +13,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 datadog.trace.instrumentation.netty41.client.NettyHttpClientDecorator; import datadog.trace.instrumentation.netty41.server.NettyHttpServerDecorator; @@ -70,7 +70,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class FireAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) { + public static ContextScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) { final AgentSpan channelSpan = spanFromContext(ctx.channel().attr(CONTEXT_ATTRIBUTE_KEY).get()); if (channelSpan == null || channelSpan == activeSpan()) { @@ -81,7 +81,7 @@ public static AgentScope scopeSpan(@Advice.This final ChannelHandlerContext ctx) } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void close(@Advice.Enter final AgentScope scope) { + public static void close(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java index f09df5944c5..7ec20a00631 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/NettyMultipartHelper.java @@ -6,7 +6,6 @@ import datadog.trace.api.gateway.BlockResponseFunction; import datadog.trace.api.gateway.Flow; import datadog.trace.api.gateway.RequestContext; -import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.http.MultipartContentDecoder; import io.netty.buffer.ByteBuf; import io.netty.handler.codec.http.multipart.Attribute; @@ -99,12 +98,7 @@ public static BlockingException tryBlock(RequestContext ctx, Flow flow, St Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { - if (!brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba)) { - Object rawAppSecCtx = ctx.getData(RequestContextSlot.APPSEC); - if (rawAppSecCtx instanceof AppSecContext) { - ((AppSecContext) rawAppSecCtx).reportBlockFailure(); - } - } + brf.tryCommitBlockingResponse(ctx, rba); return new BlockingException(message); } } diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyMultipartHelperTest.groovy b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyMultipartHelperTest.groovy index c7b5f388900..3ceaf8361c0 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyMultipartHelperTest.groovy +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/groovy/NettyMultipartHelperTest.groovy @@ -426,7 +426,7 @@ class NettyMultipartHelperTest extends Specification { NettyMultipartHelper.tryBlock(ctx, flow, 'msg') then: - 1 * brf.tryCommitBlockingResponse(segment, rba) + 1 * brf.tryCommitBlockingResponse(ctx, rba) } void 'tryBlock returns null when brf is null despite blocking action'() { diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java index e10d032d965..eb250b9fcca 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java +++ b/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/server/NettyHttp11PipeliningTest.java @@ -219,6 +219,7 @@ void additionalPipelinedRequestsBehindDeferredBlockAreIgnored() throws Exception assertTrue( readHeaders(socket.getInputStream()).startsWith("HTTP/1.1 403 "), "second response should be the deferred blocking response"); + assertTrue(handler.awaitChannelClosed(), "server did not close the blocked connection"); assertNull( handler.inboundException, "additional pipelined requests should be swallowed by the existing blocking handler"); @@ -578,6 +579,11 @@ private boolean awaitAllRequestsReceived() throws InterruptedException { return receivedRequests.await(5, SECONDS); } + private boolean awaitChannelClosed() throws InterruptedException { + ChannelHandlerContext responseContext = context; + return responseContext != null && responseContext.channel().closeFuture().await(10, SECONDS); + } + private void writeResponses() { ChannelHandlerContext responseContext = context; if (responseContext == null) { 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 92719fc85b8..4711649cc23 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDep4TestCompileClasspath,latestDep4Test com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -52,17 +52,17 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-buffer:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath io.netty:netty-buffer:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath io.netty:netty-common:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDep4TestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 7400c5fd19b..f3d3c94b801 100644 --- a/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/netty/netty-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle index afd2db5fd6a..772853fc149 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/build.gradle @@ -13,6 +13,8 @@ muzzle { addTestSuiteForDir('latestDep4Test', 'test') addTestSuiteForDir('latestDepTest', 'test') +addForkedTestTask('latestDep4Test') +addForkedTestTask('latestDepTest') dependencies { compileOnly group: 'io.netty', name: 'netty-common', version: '4.0.0.Final' 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 5f9f0a26e05..0b05b4593a7 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDep4TestCompileClasspath,latestDep4Test com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -52,13 +52,13 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDep4TestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java index a9779e28b87..8d67743d5e6 100644 --- a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorInstrumentation.java @@ -86,6 +86,9 @@ public static void before( @Advice.FieldValue("taskQueue") Queue taskQueue, @Advice.This EventExecutor executor, @Advice.Argument(0) Runnable task) { + if (!QueueTimerHelper.isReady()) { + return; + } // should be a PromiseTask which is a RunnableFuture if (task instanceof RunnableFuture) { // detect double timing - also not interested in queueing time unless the task is traced @@ -112,6 +115,9 @@ public static void before( @Advice.FieldValue("delayedTaskQueue") Queue delayedTaskQueue, @Advice.This EventExecutor executor, @Advice.Argument(0) Runnable task) { + if (!QueueTimerHelper.isReady()) { + return; + } // should be a PromiseTask which is a RunnableFuture if (task instanceof RunnableFuture) { // detect double timing - also not interested in queueing time unless the task is traced @@ -138,6 +144,9 @@ public static void before( @Advice.FieldValue("scheduledTaskQueue") Queue scheduledTaskQueue, @Advice.This EventExecutor executor, @Advice.Argument(0) Runnable task) { + if (!QueueTimerHelper.isReady()) { + return; + } // should be a PromiseTask which is a RunnableFuture if (task instanceof RunnableFuture) { // detect double timing - also not interested in queueing time unless the task is traced diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java new file mode 100644 index 00000000000..826b37103f7 --- /dev/null +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/main/java/datadog/trace/instrumentation/netty40/concurrent/SingleThreadEventExecutorStartThreadInstrumentation.java @@ -0,0 +1,59 @@ +package datadog.trace.instrumentation.netty40.concurrent; + +import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.isAsyncPropagationEnabled; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.setAsyncPropagationEnabled; +import static net.bytebuddy.matcher.ElementMatchers.isPrivate; +import static net.bytebuddy.matcher.ElementMatchers.returns; +import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; + +import com.google.auto.service.AutoService; +import datadog.trace.agent.tooling.Instrumenter; +import datadog.trace.agent.tooling.InstrumenterModule; +import net.bytebuddy.asm.Advice; + +/** Prevents Netty's lazily created event-loop maintenance tasks from inheriting user context. */ +@AutoService(InstrumenterModule.class) +public final class SingleThreadEventExecutorStartThreadInstrumentation + extends InstrumenterModule.ContextTracking + implements Instrumenter.ForKnownTypes, Instrumenter.HasMethodAdvice { + + public SingleThreadEventExecutorStartThreadInstrumentation() { + super("netty-concurrent", "netty-event-executor"); + } + + @Override + public String[] knownMatchingTypes() { + return new String[] { + "io.netty.util.concurrent.SingleThreadEventExecutor", + "io.grpc.netty.shaded.io.netty.util.concurrent.SingleThreadEventExecutor", + "com.couchbase.client.deps.io.netty.util.concurrent.SingleThreadEventExecutor", + "play.shaded.ahc.io.netty.util.concurrent.SingleThreadEventExecutor", + }; + } + + @Override + public void methodAdvice(MethodTransformer transformer) { + transformer.applyAdvice( + named("startThread").and(takesNoArguments()).and(returns(void.class)).and(isPrivate()), + getClass().getName() + "$DisableAsyncPropagation"); + } + + public static final class DisableAsyncPropagation { + @Advice.OnMethodEnter(suppress = Throwable.class) + public static boolean before() { + if (isAsyncPropagationEnabled()) { + setAsyncPropagationEnabled(false); + return true; + } + return false; + } + + @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) + public static void after(@Advice.Enter boolean wasDisabled) { + if (wasDisabled) { + setAsyncPropagationEnabled(true); + } + } + } +} diff --git a/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java new file mode 100644 index 00000000000..204419d287a --- /dev/null +++ b/dd-java-agent/instrumentation/netty/netty-concurrent-4.0/src/test/java/TimingReadinessForkedTest.java @@ -0,0 +1,135 @@ +import static datadog.trace.api.config.ProfilingConfig.PROFILING_ENABLED; +import static datadog.trace.api.config.ProfilingConfig.PROFILING_QUEUEING_TIME_ENABLED; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static java.util.concurrent.Executors.defaultThreadFactory; +import static java.util.concurrent.TimeUnit.SECONDS; +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 datadog.context.ContextScope; +import datadog.trace.agent.test.AbstractInstrumentationTest; +import datadog.trace.agent.test.TestProfilingContextIntegration; +import datadog.trace.agent.tooling.TracerInstaller; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import datadog.trace.bootstrap.instrumentation.jfr.InstrumentationBasedProfiling; +import datadog.trace.common.writer.ListWriter; +import datadog.trace.core.CoreTracer; +import datadog.trace.test.junit.utils.config.WithConfig; +import io.netty.util.concurrent.SingleThreadEventExecutor; +import java.util.Queue; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.atomic.AtomicInteger; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; + +@WithConfig(key = PROFILING_ENABLED, value = "true") +@WithConfig(key = PROFILING_QUEUEING_TIME_ENABLED, value = "true") +class TimingReadinessForkedTest extends AbstractInstrumentationTest { + private static TestProfilingContextIntegration profiling; + + @BeforeAll + static void installProfilingTracer() { + tracer.close(); + writer = new ListWriter(); + profiling = new TestProfilingContextIntegration(); + CoreTracer profilingTracer = + CoreTracer.builder().writer(writer).profilingContextIntegration(profiling).build(); + TracerInstaller.forceInstallGlobalTracer(profilingTracer); + tracer = profilingTracer; + } + + @Test + void skipsQueueMetadataUntilJfrIsReadyWhilePropagatingTrace() throws Exception { + TestExecutor executor = new TestExecutor(); + try { + assertFalse(InstrumentationBasedProfiling.isJFRReady()); + submitTask(executor); + + assertEquals(0, executor.countingQueue.sizeCalls.get()); + assertTrue(profiling.getClosedTimings().isEmpty()); + + InstrumentationBasedProfiling.enableInstrumentationBasedProfiling(); + submitTask(executor); + + assertTrue(executor.countingQueue.sizeCalls.get() > 0); + assertTrue(profiling.isBalanced()); + assertFalse(profiling.getClosedTimings().isEmpty()); + } finally { + executor.shutdownGracefully(0, 5, SECONDS).get(10, SECONDS); + profiling.getClosedTimings().clear(); + } + } + + private static void submitTask(TestExecutor executor) throws Exception { + AgentSpan span = startSpan("test", "submit"); + try (ContextScope scope = activateSpan(span)) { + ContextCheckingTask task = new ContextCheckingTask(); + executor.submit(task).get(5, SECONDS); + assertEquals(span.getSpanId(), task.spanId); + } finally { + span.finish(); + } + } + + static class ContextCheckingTask implements Runnable { + volatile long spanId; + + @Override + public void run() { + AgentSpan span = AgentTracer.activeSpan(); + spanId = span == null ? 0 : span.getSpanId(); + } + } + + static class TestExecutor extends SingleThreadEventExecutor { + CountingQueue countingQueue; + + TestExecutor() { + super(null, defaultThreadFactory(), true); + } + + @Override + protected Queue newTaskQueue() { + countingQueue = new CountingQueue(); + return countingQueue; + } + + // Newer Netty versions use the factory overload with a capacity argument. + protected Queue newTaskQueue(int maxPendingTasks) { + return newTaskQueue(); + } + + @Override + protected void run() { + while (true) { + Runnable task = takeTask(); + if (task != null) { + task.run(); + updateLastExecutionTime(); + } + if (confirmShutdown()) { + return; + } + } + } + } + + static class CountingQueue extends LinkedBlockingQueue { + final AtomicInteger sizeCalls = new AtomicInteger(); + + @Override + public int size() { + sizeCalls.incrementAndGet(); + return super.size(); + } + + @Override + public boolean isEmpty() { + // Keep executor housekeeping separate from metadata reads. + return super.size() == 0; + } + } +} 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 cc083d3c784..3bafa38b2a5 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDep4TestCompileClasspath,latestDep4Test com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDep4TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -52,14 +52,14 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.netty:netty-common:4.0.0.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath io.netty:netty-common:5.0.0.Alpha2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDep4TestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDep4TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDep4TestCompileClasspath,latestDep4TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 89b311d96da..99afa0bfd85 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f92087e8141..352a6c33f74 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,8 +100,8 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.10.1=spotbugs diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java index 8a32cfd4578..82b3e0189ad 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/main/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptor.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.okhttp2; import static datadog.trace.api.gateway.Events.EVENTS; +import static java.util.Collections.unmodifiableList; import com.squareup.okhttp.Headers; import com.squareup.okhttp.Interceptor; @@ -19,16 +20,19 @@ import datadog.trace.api.gateway.Flow; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.api.internal.VisibleForTesting; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Tags; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.function.BiFunction; import okio.BufferedSink; import okio.BufferedSource; @@ -175,7 +179,7 @@ private static

void publish( BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; - brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(ctx, rba); } throw new BlockingException("Blocked request (for http downstream request)"); } @@ -229,13 +233,27 @@ private static byte[] readBody(final ResponseBody body, final int contentLength) return buffer.toByteArray(); } - private static Map> mapHeaders(final Headers headers) { + @VisibleForTesting + static Map> mapHeaders(final Headers headers) { if (headers == null) { return Collections.emptyMap(); } - final Map> result = new HashMap<>(headers.size()); - for (final String name : headers.names()) { - result.put(name, headers.values(name)); + final Map> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + for (int i = 0; i < headers.size(); i++) { + final String name = headers.name(i); + List values = grouped.get(name); + if (values == null) { + values = new ArrayList<>(2); + grouped.put(name, values); + } + values.add(headers.value(i)); + } + final int size = grouped.size(); + // Account for HashMap's default load factor to avoid resizing while copying. + final int capacity = size + (size + 2) / 3; + final Map> result = new HashMap<>(capacity); + for (Map.Entry> entry : grouped.entrySet()) { + result.put(entry.getKey(), unmodifiableList(entry.getValue())); } return result; } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java new file mode 100644 index 00000000000..e4e13a7ab42 --- /dev/null +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecHeadersTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.okhttp2; + +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.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import com.squareup.okhttp.Headers; +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import org.junit.jupiter.api.Test; + +class AppSecHeadersTest { + @Test + void handlesNullAndEmptyHeaders() { + assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty()); + Map> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build()); + assertTrue(empty.isEmpty()); + empty.put("added", singletonList("value")); + assertEquals(singletonList("value"), empty.get("added")); + } + + @Test + void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() { + Headers headers = + new Headers.Builder() + .add("X-Example", "one") + .add("Other", "") + .add("x-example", "two") + .add("X-EXAMPLE", "three") + .build(); + Map> result = AppSecInterceptor.mapHeaders(headers); + assertEquals(2, result.size()); + assertEquals(asList("one", "two", "three"), result.get("X-Example")); + assertEquals(singletonList(""), result.get("Other")); + assertFalse(result.containsKey("x-example")); + assertThrows(UnsupportedOperationException.class, () -> result.get("X-Example").add("four")); + result.put("x-example", singletonList("separate")); + assertEquals(3, result.size()); + } + + @Test + void matchesExistingConversionAcrossHeaderDistributions() { + Random random = new Random(937); + for (int sample = 0; sample < 200; sample++) { + Headers.Builder builder = new Headers.Builder(); + for (int i = 0, size = random.nextInt(65); i < size; i++) { + String name = "X-Header-" + random.nextInt(24); + if (random.nextBoolean()) { + name = name.toLowerCase(Locale.ROOT); + } + builder.add(name, "value-" + i); + } + Headers headers = builder.build(); + Map> expected = new HashMap<>(); + for (String name : headers.names()) { + expected.put(name, headers.values(name)); + } + assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample); + } + } +} diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java new file mode 100644 index 00000000000..b04c9fda478 --- /dev/null +++ b/dd-java-agent/instrumentation/okhttp/okhttp-2.2/src/test/java/datadog/trace/instrumentation/okhttp2/AppSecInterceptorBlockFailureTest.java @@ -0,0 +1,108 @@ +package datadog.trace.instrumentation.okhttp2; + +import static datadog.trace.api.gateway.Events.EVENTS; +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.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import com.squareup.okhttp.Request; +import datadog.appsec.api.blocking.BlockingContentType; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.appsec.HttpClientRequest; +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.api.internal.TraceSegment; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** + * Covers the wiring between {@code AppSecInterceptor.publish()} and {@link + * BlockResponseFunction#tryCommitBlockingResponse(RequestContext, + * Flow.Action.RequestBlockingAction)}, which is the method that reports block failures. Driven + * through the public {@code onRequest()} entry point, which always ends in a {@link + * BlockingException} when the callback returns a blocking flow. + */ +class AppSecInterceptorBlockFailureTest { + + private static final Flow.Action.RequestBlockingAction RBA = + new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO); + + private final AgentTracer.TracerAPI originalTracer = AgentTracer.get(); + + private Request request; + private RequestContext ctx; + private AgentSpan span; + + @BeforeEach + void setup() { + request = new Request.Builder().url("http://example.com").build(); + ctx = mock(RequestContext.class); + when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class)); + + span = mock(AgentSpan.class); + when(span.getRequestContext()).thenReturn(ctx); + when(span.getSpanId()).thenReturn(1L); + + final BiFunction> callback = + (requestContext, clientRequest) -> blockingFlow(); + final CallbackProvider cbp = mock(CallbackProvider.class); + when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback); + + final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class); + when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp); + AgentTracer.forceRegister(tracer); + } + + @AfterEach + void tearDown() { + AgentTracer.forceRegister(originalTracer); + } + + @Test + void commitsBlockingResponseWithTheRequestContext() { + final BlockResponseFunction brf = mock(BlockResponseFunction.class); + when(ctx.getBlockResponseFunction()).thenReturn(brf); + + assertThrows(BlockingException.class, this::onRequest); + + verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA); + } + + @Test + void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() { + when(ctx.getBlockResponseFunction()).thenReturn(null); + + assertThrows(BlockingException.class, this::onRequest); + + verify(ctx, never()).getData(any(RequestContextSlot.class)); + } + + private void onRequest() { + AppSecInterceptor.onRequest(span, false, "http://example.com", request); + } + + private static Flow blockingFlow() { + return new Flow() { + @Override + public Action getAction() { + return RBA; + } + + @Override + public Void getResult() { + return null; + } + }; + } +} 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 4fdedb45501..4f0015c96fa 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,8 +99,8 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.10.1=spotbugs diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java index 9d78a5f54ce..7cfecfbebb1 100644 --- a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/main/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptor.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.okhttp3; import static datadog.trace.api.gateway.Events.EVENTS; +import static java.util.Collections.unmodifiableList; import datadog.appsec.api.blocking.BlockingException; import datadog.trace.api.Config; @@ -13,16 +14,19 @@ import datadog.trace.api.gateway.Flow; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; +import datadog.trace.api.internal.VisibleForTesting; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Tags; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; +import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.TreeMap; import java.util.function.BiFunction; import okhttp3.Headers; import okhttp3.Interceptor; @@ -175,7 +179,7 @@ private static

void publish( BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; - brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(ctx, rba); } throw new BlockingException("Blocked request (for http downstream request)"); } @@ -229,13 +233,27 @@ private static byte[] readBody(final ResponseBody body, final int contentLength) return buffer.toByteArray(); } - private static Map> mapHeaders(final Headers headers) { + @VisibleForTesting + static Map> mapHeaders(final Headers headers) { if (headers == null) { return Collections.emptyMap(); } - final Map> result = new HashMap<>(headers.size()); - for (final String name : headers.names()) { - result.put(name, headers.values(name)); + final Map> grouped = new TreeMap<>(String.CASE_INSENSITIVE_ORDER); + for (int i = 0; i < headers.size(); i++) { + final String name = headers.name(i); + List values = grouped.get(name); + if (values == null) { + values = new ArrayList<>(2); + grouped.put(name, values); + } + values.add(headers.value(i)); + } + final int size = grouped.size(); + // Account for HashMap's default load factor to avoid resizing while copying. + final int capacity = size + (size + 2) / 3; + final Map> result = new HashMap<>(capacity); + for (Map.Entry> entry : grouped.entrySet()) { + result.put(entry.getKey(), unmodifiableList(entry.getValue())); } return result; } diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java new file mode 100644 index 00000000000..d56d547218f --- /dev/null +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecHeadersTest.java @@ -0,0 +1,67 @@ +package datadog.trace.instrumentation.okhttp3; + +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.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.HashMap; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Random; +import okhttp3.Headers; +import org.junit.jupiter.api.Test; + +class AppSecHeadersTest { + @Test + void handlesNullAndEmptyHeaders() { + assertTrue(AppSecInterceptor.mapHeaders(null).isEmpty()); + Map> empty = AppSecInterceptor.mapHeaders(new Headers.Builder().build()); + assertTrue(empty.isEmpty()); + empty.put("added", singletonList("value")); + assertEquals(singletonList("value"), empty.get("added")); + } + + @Test + void preservesFirstSpellingValueOrderAndCaseSensitiveLookup() { + Headers headers = + new Headers.Builder() + .add("X-Example", "one") + .add("Other", "") + .add("x-example", "two") + .add("X-EXAMPLE", "three") + .build(); + Map> result = AppSecInterceptor.mapHeaders(headers); + assertEquals(2, result.size()); + assertEquals(asList("one", "two", "three"), result.get("X-Example")); + assertEquals(singletonList(""), result.get("Other")); + assertFalse(result.containsKey("x-example")); + assertThrows(UnsupportedOperationException.class, () -> result.get("X-Example").add("four")); + result.put("x-example", singletonList("separate")); + assertEquals(3, result.size()); + } + + @Test + void matchesExistingConversionAcrossHeaderDistributions() { + Random random = new Random(937); + for (int sample = 0; sample < 200; sample++) { + Headers.Builder builder = new Headers.Builder(); + for (int i = 0, size = random.nextInt(65); i < size; i++) { + String name = "X-Header-" + random.nextInt(24); + if (random.nextBoolean()) { + name = name.toLowerCase(Locale.ROOT); + } + builder.add(name, "value-" + i); + } + Headers headers = builder.build(); + Map> expected = new HashMap<>(); + for (String name : headers.names()) { + expected.put(name, headers.values(name)); + } + assertEquals(expected, AppSecInterceptor.mapHeaders(headers), "sample " + sample); + } + } +} diff --git a/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java new file mode 100644 index 00000000000..0f403700c88 --- /dev/null +++ b/dd-java-agent/instrumentation/okhttp/okhttp-3.0/src/test/java/datadog/trace/instrumentation/okhttp3/AppSecInterceptorBlockFailureTest.java @@ -0,0 +1,108 @@ +package datadog.trace.instrumentation.okhttp3; + +import static datadog.trace.api.gateway.Events.EVENTS; +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.never; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import datadog.appsec.api.blocking.BlockingContentType; +import datadog.appsec.api.blocking.BlockingException; +import datadog.trace.api.appsec.HttpClientRequest; +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.api.internal.TraceSegment; +import datadog.trace.bootstrap.instrumentation.api.AgentSpan; +import datadog.trace.bootstrap.instrumentation.api.AgentTracer; +import java.util.function.BiFunction; +import okhttp3.Request; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +/** + * Covers the wiring between {@code AppSecInterceptor.publish()} and {@link + * BlockResponseFunction#tryCommitBlockingResponse(RequestContext, + * Flow.Action.RequestBlockingAction)}, which is the method that reports block failures. Driven + * through the public {@code onRequest()} entry point, which always ends in a {@link + * BlockingException} when the callback returns a blocking flow. + */ +class AppSecInterceptorBlockFailureTest { + + private static final Flow.Action.RequestBlockingAction RBA = + new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO); + + private final AgentTracer.TracerAPI originalTracer = AgentTracer.get(); + + private Request request; + private RequestContext ctx; + private AgentSpan span; + + @BeforeEach + void setup() { + request = new Request.Builder().url("http://example.com").build(); + ctx = mock(RequestContext.class); + when(ctx.getTraceSegment()).thenReturn(mock(TraceSegment.class)); + + span = mock(AgentSpan.class); + when(span.getRequestContext()).thenReturn(ctx); + when(span.getSpanId()).thenReturn(1L); + + final BiFunction> callback = + (requestContext, clientRequest) -> blockingFlow(); + final CallbackProvider cbp = mock(CallbackProvider.class); + when(cbp.getCallback(EVENTS.httpClientRequest())).thenReturn(callback); + + final AgentTracer.TracerAPI tracer = mock(AgentTracer.TracerAPI.class); + when(tracer.getCallbackProvider(any(RequestContextSlot.class))).thenReturn(cbp); + AgentTracer.forceRegister(tracer); + } + + @AfterEach + void tearDown() { + AgentTracer.forceRegister(originalTracer); + } + + @Test + void commitsBlockingResponseWithTheRequestContext() { + final BlockResponseFunction brf = mock(BlockResponseFunction.class); + when(ctx.getBlockResponseFunction()).thenReturn(brf); + + assertThrows(BlockingException.class, this::onRequest); + + verify(brf, times(1)).tryCommitBlockingResponse(ctx, RBA); + } + + @Test + void doesNotTouchAppSecSlotWhenThereIsNoBlockResponseFunction() { + when(ctx.getBlockResponseFunction()).thenReturn(null); + + assertThrows(BlockingException.class, this::onRequest); + + verify(ctx, never()).getData(any(RequestContextSlot.class)); + } + + private void onRequest() { + AppSecInterceptor.onRequest(span, false, "http://example.com", request); + } + + private static Flow blockingFlow() { + return new Flow() { + @Override + public Action getAction() { + return RBA; + } + + @Override + public Void getResult() { + return null; + } + }; + } +} 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 a6fce6cbbae..7b527f4148d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,testCompileClasspath 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-instrument-java:0.0.5=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 @@ -37,8 +37,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.github.victools:jsonschema-generator:4.38.0=latestDepTestRuntimeClasspath,testRuntimeClasspath com.github.victools:jsonschema-module-jackson:4.38.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -61,11 +61,11 @@ com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnota 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.54.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java-client-okhttp:4.64.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.openai:openai-java-core:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.openai:openai-java-core:4.54.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java-core:4.64.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.openai:openai-java:3.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.openai:openai-java:4.54.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.openai:openai-java:4.64.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 @@ -85,8 +85,8 @@ io.swagger.core.v3:swagger-annotations:2.2.31=compileClasspath,latestDepTestComp javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java index d5ad641b670..e8536d554da 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceAsyncInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -14,8 +15,8 @@ import com.openai.models.chat.completions.ChatCompletion; import com.openai.models.chat.completions.ChatCompletionChunk; import com.openai.models.chat.completions.ChatCompletionCreateParams; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CompletableFuture; import net.bytebuddy.asm.Advice; @@ -59,7 +60,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ChatCompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -69,10 +70,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { @@ -86,7 +87,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ChatCompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -96,11 +97,11 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture>> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java index fb0cfded56f..7d863dcd4b8 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ChatCompletionServiceInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -14,8 +15,8 @@ import com.openai.models.chat.completions.ChatCompletion; import com.openai.models.chat.completions.ChatCompletionChunk; import com.openai.models.chat.completions.ChatCompletionCreateParams; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -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; @@ -58,7 +59,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ChatCompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -68,10 +69,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { @@ -86,7 +87,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ChatCompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -96,11 +97,11 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor> response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java index e372a4a4cc1..74347d37860 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceAsyncInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -13,8 +14,8 @@ import com.openai.core.http.StreamResponse; import com.openai.models.completions.Completion; import com.openai.models.completions.CompletionCreateParams; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CompletableFuture; import net.bytebuddy.asm.Advice; @@ -54,7 +55,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final CompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -64,10 +65,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { @@ -82,7 +83,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final CompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -92,11 +93,11 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture>> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java index d3f23e2d0aa..c7b6387c85f 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/CompletionServiceInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -13,8 +14,8 @@ import com.openai.core.http.StreamResponse; import com.openai.models.completions.Completion; import com.openai.models.completions.CompletionCreateParams; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -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; @@ -53,7 +54,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final CompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -65,10 +66,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { @@ -82,7 +83,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final CompletionCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -92,10 +93,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor> response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java index 259bf901b58..f2b3106215c 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/EmbeddingServiceInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -12,8 +13,8 @@ import com.openai.core.http.HttpResponseFor; import com.openai.models.embeddings.CreateEmbeddingResponse; import com.openai.models.embeddings.EmbeddingCreateParams; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -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; @@ -45,7 +46,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final EmbeddingCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -55,10 +56,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java index c4c5171b221..ed316703a39 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceAsyncInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -14,8 +15,8 @@ import com.openai.models.responses.Response; import com.openai.models.responses.ResponseCreateParams; import com.openai.models.responses.ResponseStreamEvent; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.concurrent.CompletableFuture; import net.bytebuddy.asm.Advice; @@ -55,7 +56,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ResponseCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -65,10 +66,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { @@ -82,7 +83,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ResponseCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -92,11 +93,11 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) CompletableFuture>> future, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || future == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java index 73905000a14..6de041b34ce 100644 --- a/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/openai-java/openai-java-3.0/src/main/java/datadog/trace/instrumentation/openai_java/ResponseServiceInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.declaresField; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.openai_java.OpenAiDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.returns; @@ -14,8 +15,8 @@ import com.openai.models.responses.Response; import com.openai.models.responses.ResponseCreateParams; import com.openai.models.responses.ResponseStreamEvent; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -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; @@ -54,7 +55,7 @@ public ElementMatcher structureMatcher() { public static class CreateAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ResponseCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -64,10 +65,10 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { @@ -81,7 +82,7 @@ public static void exit( public static class CreateStreamingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.Argument(0) final ResponseCreateParams params, @Advice.FieldValue("clientOptions") ClientOptions clientOptions) { AgentSpan span = DECORATE.startSpan(clientOptions); @@ -91,11 +92,11 @@ public static AgentScope enter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return(readOnly = false) HttpResponseFor> response, @Advice.Thrown final Throwable err) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (err != null || response == null) { DECORATE.finishSpan(span, err); } else { diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile index ee93bae489e..d5039774583 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opensearch/opensearch-common/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.8.1=compileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -64,8 +64,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.4=compileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=compileClasspath @@ -129,7 +129,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.locationtech.jts:jts-core:1.15.0=compileClasspath org.locationtech.spatial4j:spatial4j:0.7=compileClasspath org.mockito:mockito-core:4.4.0=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 ce36791122d..5a847f065f7 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -27,8 +27,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.spullara.mustache.java:compiler:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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,8 +72,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -137,7 +137,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.locationtech.jts:jts-core:1.15.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java index e6c900cad53..fb0f0f43200 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/opensearch-rest-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchRestClientInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.opensearch.OpensearchRestClientDecorator.DECORATE; import static datadog.trace.instrumentation.opensearch.OpensearchRestClientDecorator.OPENSEARCH_JAVA; import static datadog.trace.instrumentation.opensearch.OpensearchRestClientDecorator.OPERATION_NAME; @@ -11,9 +12,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import net.bytebuddy.implementation.bytecode.assign.Assigner; @@ -62,7 +63,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class OpensearchRestClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final Request request, @Advice.Argument(value = 1, readOnly = false, optional = true) ResponseListener responseListener) { @@ -85,17 +86,17 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return(typing = Assigner.Typing.DYNAMIC) final Object result) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); span.finish(); } else if (result instanceof Response) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (((Response) result).getHost() != null) { DECORATE.onResponse(span, ((Response) result)); } 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 42604a4f53a..c3a9fa6c360 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 @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.carrotsearch:hppc:0.8.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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-instrument-java:0.0.5=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 @@ -27,8 +27,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath @@ -72,8 +72,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.4=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jopt-simple:jopt-simple:5.0.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -137,7 +137,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.locationtech.jts:jts-core:1.15.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.locationtech.spatial4j:spatial4j:0.7=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java index 1ce9c01ba98..b54b787fbf0 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/OpensearchTransportClientInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator.DECORATE; import static datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator.OPENSEARCH_JAVA; import static datadog.trace.instrumentation.opensearch.OpensearchTransportClientDecorator.OPERATION_NAME; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import net.bytebuddy.matcher.ElementMatcher; @@ -65,7 +66,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class OpensearchTransportClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final ActionType action, @Advice.Argument(1) final ActionRequest actionRequest, @Advice.Argument(value = 2, readOnly = false) @@ -82,9 +83,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (throwable != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java index b2902bf4ff5..f0de0d46e48 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/main/java/datadog/trace/instrumentation/opensearch/ShadowExistingScopeAdvice.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import net.bytebuddy.asm.Advice; /** @@ -13,12 +13,12 @@ public class ShadowExistingScopeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } diff --git a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy index 42f23f38ea2..514739078cd 100644 --- a/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy +++ b/dd-java-agent/instrumentation/opensearch/opensearch-transport-1.0/src/test/groovy/OpensearchTransportClientTest.groovy @@ -35,12 +35,6 @@ class OpensearchTransportClientTest extends InstrumentationSpecification { @Shared TransportClient client - @Override - boolean useStrictTraceWrites() { - //FIXME IDM - false - } - @Override protected void configurePreAgent() { super.configurePreAgent() 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 c344f209495..68b9b088fab 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java index ed1ca770fb9..294228b01d4 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/OtelScope.java @@ -1,13 +1,13 @@ package datadog.trace.instrumentation.opentelemetry; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.context.TraceScope; import io.opentelemetry.context.Scope; public class OtelScope implements Scope, TraceScope { - private final AgentScope delegate; + private final ContextScope delegate; - OtelScope(final AgentScope delegate) { + OtelScope(final ContextScope delegate) { this.delegate = delegate; } 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 529ec13aa65..4d88fa67280 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 @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.opentelemetry; -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; @@ -38,7 +38,7 @@ public Scope withSpan(final Span span) { } final AgentSpan agentSpan = converter.toAgentSpan(span); - final AgentScope agentScope = tracer.activateManualSpan(agentSpan); + final ContextScope agentScope = tracer.activateManualSpan(agentSpan); return converter.toScope(agentScope); } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java index 66f5602c50e..7ce0080a06b 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-0.3/src/main/java/datadog/trace/instrumentation/opentelemetry/TypeConverter.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; @@ -48,7 +48,7 @@ public Span toSpan(final AgentSpan agentSpan) { return new OtelSpan(agentSpan, this); } - public Scope toScope(final AgentScope scope) { + public Scope toScope(final ContextScope scope) { if (scope == null) { return null; } 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 67734f10a53..2ca271b47b7 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.27/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -53,16 +53,16 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.27.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-common:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.27.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0c962e3d8fd..ce541ffc699 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -54,16 +54,16 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-common:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.4.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java index d5fd8751df8..a644feebb02 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.4/src/test/java/opentelemetry14/context/ContextTest.java @@ -8,8 +8,8 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import datadog.context.ContextScope; import datadog.trace.api.DDSpanId; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.opentelemetry.api.baggage.Baggage; import io.opentelemetry.api.trace.Span; @@ -53,7 +53,7 @@ void testSpanCurrentMakeCurrent() { // After activating DD span: Datadog span must be current span AgentSpan ddSpan = tracer.startSpan("dd-api", "other-name"); - AgentScope ddScope = tracer.activateManualSpan(ddSpan); + ContextScope ddScope = tracer.activateManualSpan(ddSpan); currentSpan = Span.current(); assertSpanEquals(ddSpan, currentSpan); @@ -95,7 +95,7 @@ void testContextMakeCurrentWithoutPriorActiveSpan() { @Test void testContextMakeCurrentWithAnotherActiveSpan() { AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name"); - AgentScope ddScope = tracer.activateManualSpan(ddSpan); + ContextScope ddScope = tracer.activateManualSpan(ddSpan); Span otelSpan = this.otelTracer.spanBuilder("other-name").startSpan(); // DD span is active: current OTel span reflects DD span @@ -125,7 +125,7 @@ void testContextMakeCurrentWithAnotherActiveSpan() { @Test void testContextMakeCurrentAlreadyActiveSpan() { AgentSpan ddSpan = tracer.startSpan("dd-api", "some-name"); - AgentScope ddScope = tracer.activateManualSpan(ddSpan); + ContextScope ddScope = tracer.activateManualSpan(ddSpan); Span currentSpan = Span.current(); assertNotNull(currentSpan); @@ -180,7 +180,7 @@ void testMixingManualAndOtelInstrumentation() { // Activate DD child span and verify OTel current span AgentSpan ddChildSpan = tracer.startSpan("dd-api", "other-name"); - AgentScope ddChildScope = tracer.activateManualSpan(ddChildSpan); + ContextScope ddChildScope = tracer.activateManualSpan(ddChildSpan); Span current = Span.current(); assertEquals( 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 c396b82bdf1..142e2e8c945 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-1.47/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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:2.13.1=latestDepTestCompileClasspath,testCompileClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -30,8 +30,8 @@ com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,testRuntimeClasspa com.github.jnr:jnr-unixsocket:0.36=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,16 +61,16 @@ commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath io.opentelemetry:opentelemetry-api:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-api:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.opentelemetry:opentelemetry-common:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-api:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-common:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.opentelemetry:opentelemetry-context:1.47.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.opentelemetry:opentelemetry-context:1.65.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.opentelemetry:opentelemetry-context:1.66.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -111,7 +111,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 cc7dce14469..9fa8db3bb79 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latest1xDepTestCompileClasspath,latest1xDepTe com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest1xDepTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -66,8 +66,8 @@ io.sqreen:libsqreen:17.5.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeC javax.servlet:javax.servlet-api:3.1.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -108,7 +108,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latest1xDepTestRuntimeClasspath, org.junit.platform:junit-platform-suite-api:1.14.1=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latest1xDepTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latest1xDepTestCompileClasspath,latest1xDepTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java index af46a8ff208..0a7bf4c13ba 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAdvice.java @@ -1,9 +1,10 @@ package datadog.trace.instrumentation.opentelemetry.annotations; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.opentelemetry.annotations.WithSpanDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.invoke.MethodType; import java.lang.reflect.Method; @@ -12,20 +13,21 @@ public class WithSpanAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Origin final Method method) { + public static ContextScope onEnter(@Advice.Origin final Method method) { AgentSpan span = DECORATE.startMethodSpan(method); return activateSpan(span); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Origin final MethodType methodType, @Advice.Return(typing = Assigner.Typing.DYNAMIC, readOnly = false) Object result, @Advice.Thrown final Throwable throwable) { DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - result = DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), scope.span()); + result = + DECORATE.wrapAsyncResultOrFinishSpan(result, methodType.returnType(), spanFromScope(scope)); } } diff --git a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java index 3febd171487..df1f5717c8a 100644 --- a/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java +++ b/dd-java-agent/instrumentation/opentelemetry/opentelemetry-annotations-1.20/src/main/java/datadog/trace/instrumentation/opentelemetry/annotations/WithSpanAttributeAdvice.java @@ -1,16 +1,17 @@ package datadog.trace.instrumentation.opentelemetry.annotations; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.opentelemetry.annotations.WithSpanDecorator.DECORATE; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import net.bytebuddy.asm.Advice; public class WithSpanAttributeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Origin final Method method, @Advice.AllArguments final Object[] args) { AgentSpan span = DECORATE.startMethodSpan(method); DECORATE.addTagsFromMethodArgs(span, method, args); @@ -19,10 +20,10 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } 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 516fffe6b38..af8eceb5449 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -104,7 +104,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 fd02b676511..8b77981a6a6 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java index 6028aefea15..0faa346dda4 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/OTScopeManager.java @@ -1,7 +1,8 @@ package datadog.trace.instrumentation.opentracing31; +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; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.context.TraceScope; @@ -29,7 +30,7 @@ public Scope activate(final Span span, final boolean finishSpanOnClose) { } final AgentSpan agentSpan = converter.toAgentSpan(span); - final AgentScope agentScope = tracer.activateManualSpan(agentSpan); + final ContextScope agentScope = tracer.activateManualSpan(agentSpan); return converter.toScope(agentScope, finishSpanOnClose); } @@ -46,12 +47,14 @@ public Scope active() { } static class OTScope implements Scope, TraceScope { - private final AgentScope delegate; + private final ContextScope delegate; private final boolean finishSpanOnClose; private final TypeConverter converter; OTScope( - final AgentScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) { + final ContextScope delegate, + final boolean finishSpanOnClose, + final TypeConverter converter) { this.delegate = delegate; this.finishSpanOnClose = finishSpanOnClose; this.converter = converter; @@ -62,13 +65,13 @@ public void close() { delegate.close(); if (finishSpanOnClose) { - delegate.span().finish(); + AgentSpan.fromScope(delegate).finish(); } } @Override public Span span() { - return converter.toSpan(delegate.span()); + return converter.toSpan(AgentSpan.fromScope(delegate)); } public boolean isFinishSpanOnClose() { @@ -76,7 +79,7 @@ public boolean isFinishSpanOnClose() { } } - private final class FakeScope implements AgentScope { + private final class FakeScope implements ContextScope { private final AgentSpan agentSpan; FakeScope(AgentSpan agentSpan) { @@ -84,7 +87,7 @@ private final class FakeScope implements AgentScope { } @Override - public AgentSpan span() { + public Context context() { return agentSpan; } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java index 9d89a0c9320..734ab0b7123 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/main/java/datadog/trace/instrumentation/opentracing31/TypeConverter.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; @@ -51,7 +51,7 @@ public OTSpan toSpan(final AgentSpan agentSpan) { return new OTSpan(agentSpan, this, logHandler); } - public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) { + public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) { if (scope == null) { return null; } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/TypeConverterTest.groovy index fcdd67b9e4b..3a3b5c6efca 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/TypeConverterTest.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.31/src/test/groovy/TypeConverterTest.groovy @@ -8,7 +8,7 @@ import datadog.trace.core.DDSpanContext import datadog.trace.core.PendingTrace import datadog.trace.core.propagation.PropagationTags import datadog.trace.instrumentation.opentracing.DefaultLogHandler -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.instrumentation.opentracing31.TypeConverter import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan @@ -41,8 +41,8 @@ class TypeConverterTest extends InstrumentationSpecification { } def "should reuse the noop span wrapper via scope"() { - def noopScope = Stub(AgentScope) { - span() >> noopSpan() + def noopScope = Stub(ContextScope) { + context() >> noopSpan() } def noopSpanWrapper = typeConverter.toSpan(noopSpan()) expect: 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 e9e1a2b878f..edbf8d76706 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java index ee007d8d770..5591ac985cb 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/OTScopeManager.java @@ -1,7 +1,8 @@ package datadog.trace.instrumentation.opentracing32; +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; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.context.TraceScope; @@ -34,7 +35,7 @@ public Scope activate(final Span span, final boolean finishSpanOnClose) { } final AgentSpan agentSpan = converter.toAgentSpan(span); - final AgentScope agentScope = tracer.activateManualSpan(agentSpan); + final ContextScope agentScope = tracer.activateManualSpan(agentSpan); return converter.toScope(agentScope, finishSpanOnClose); } @@ -56,12 +57,14 @@ public Span activeSpan() { } static class OTScope implements Scope, TraceScope { - private final AgentScope delegate; + private final ContextScope delegate; private final boolean finishSpanOnClose; private final TypeConverter converter; OTScope( - final AgentScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) { + final ContextScope delegate, + final boolean finishSpanOnClose, + final TypeConverter converter) { this.delegate = delegate; this.finishSpanOnClose = finishSpanOnClose; this.converter = converter; @@ -72,13 +75,13 @@ public void close() { delegate.close(); if (finishSpanOnClose) { - delegate.span().finish(); + AgentSpan.fromScope(delegate).finish(); } } @Override public Span span() { - return converter.toSpan(delegate.span()); + return converter.toSpan(AgentSpan.fromScope(delegate)); } public boolean isFinishSpanOnClose() { @@ -86,7 +89,7 @@ public boolean isFinishSpanOnClose() { } } - private final class FakeScope implements AgentScope { + private final class FakeScope implements ContextScope { private final AgentSpan agentSpan; FakeScope(AgentSpan agentSpan) { @@ -94,7 +97,7 @@ private final class FakeScope implements AgentScope { } @Override - public AgentSpan span() { + public Context context() { return agentSpan; } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java index 2d2b78b8146..f686d3ca40b 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/main/java/datadog/trace/instrumentation/opentracing32/TypeConverter.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; @@ -51,7 +51,7 @@ public OTSpan toSpan(final AgentSpan agentSpan) { return new OTSpan(agentSpan, this, logHandler); } - public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) { + public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) { if (scope == null) { return null; } diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/TypeConverterTest.groovy b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/TypeConverterTest.groovy index 795964ec8eb..9ecfd5221ef 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/TypeConverterTest.groovy +++ b/dd-java-agent/instrumentation/opentracing/opentracing-0.32/src/test/groovy/TypeConverterTest.groovy @@ -8,7 +8,7 @@ import datadog.trace.core.DDSpanContext import datadog.trace.core.PendingTrace import datadog.trace.core.propagation.PropagationTags import datadog.trace.instrumentation.opentracing.DefaultLogHandler -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.instrumentation.opentracing32.TypeConverter import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan @@ -41,8 +41,8 @@ class TypeConverterTest extends InstrumentationSpecification { } def "should reuse the noop span wrapper via scope"() { - def noopScope = Stub(AgentScope) { - span() >> noopSpan() + def noopScope = Stub(ContextScope) { + context() >> noopSpan() } def noopSpanWrapper = typeConverter.toSpan(noopSpan()) expect: diff --git a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile index e9352dbc0a2..f79c8ae184b 100644 --- a/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/opentracing/opentracing-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 56f72c4e73d..55ed15406af 100644 --- a/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile +++ b/dd-java-agent/instrumentation/org-json-20230227/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile index 63ff9b89c83..a5fed026a6d 100644 --- a/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/osgi-4.3/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 57a072b4cec..08388ee0ef8 100644 --- a/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/owasp-esapi-2.1/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -23,8 +23,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -76,8 +76,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.16=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath logkit:logkit:1.0.1=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -135,7 +135,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 941e8224583..f1d53b7fb32 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -64,8 +64,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.openhft:zero-allocation-hashing:0.16=zinc @@ -118,7 +118,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoActorTest.groovy b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoActorTest.groovy index 9b70f175ce5..b3d4d6b1e95 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoActorTest.groovy +++ b/dd-java-agent/instrumentation/pekko/pekko-concurrent-1.0/src/test/groovy/PekkoActorTest.groovy @@ -4,7 +4,7 @@ import datadog.trace.bootstrap.instrumentation.api.Tags import spock.lang.AutoCleanup import spock.lang.Shared -class PekkoActorTest extends InstrumentationSpecification { +abstract class AbstractPekkoActorTest extends InstrumentationSpecification { @Shared @AutoCleanup @@ -94,8 +94,10 @@ class PekkoActorTest extends InstrumentationSpecification { } } } +} - def "actor message handling should close leaked scopes"() { +class PekkoActorTest extends AbstractPekkoActorTest { + def "legacy actor message handling should close leaked scopes"() { when: pekkoTester.leak("Leaker", "drip") @@ -124,7 +126,7 @@ class PekkoActorTest extends InstrumentationSpecification { } } -class PekkoActorContextSwapForkedTest extends PekkoActorTest { +class PekkoActorContextSwapForkedTest extends AbstractPekkoActorTest { @Override void configurePreAgent() { super.configurePreAgent() 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 bc91e019034..f5b52b7a807 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=baseTestCompileClasspath,baseTestRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepIastTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestPekko10TestAnnotationProcessor,testAnnotationProcessor @@ -81,8 +81,8 @@ io.sqreen:libsqreen:17.5.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,lat javax.servlet:javax.servlet-api:3.1.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc @@ -151,7 +151,6 @@ org.junit.platform:junit-platform-runner:1.14.1=baseTestRuntimeClasspath,iastTes org.junit.platform:junit-platform-suite-api:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=baseTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepIastTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestPekko10TestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=baseTestCompileClasspath,baseTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepIastTestCompileClasspath,latestDepIastTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestPekko10TestCompileClasspath,latestPekko10TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy index 9f7fa23c2b1..1034cf83e26 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/groovy/PekkoHttpServerInstrumentationTest.groovy @@ -1,6 +1,7 @@ import datadog.trace.agent.test.base.HttpServer import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.naming.TestingGenericHttpNamingConventions +import datadog.trace.api.config.TraceInstrumentationConfig import datadog.trace.test.util.ThreadUtils import datadog.trace.instrumentation.pekkohttp.PekkoHttpServerDecorator import okhttp3.Request @@ -126,6 +127,20 @@ class PekkoHttpServerInstrumentationBindAndHandleTest extends PekkoHttpServerIns } } +class PekkoHttpServerInstrumentationBindAndHandleContextSwapForkedTest extends PekkoHttpServerInstrumentationBindAndHandleTest { + @Override + boolean recreateServerForEachTest() { + // This forked suite changes a process-wide setting; do not let its actor system outlive it. + true + } + + @Override + void configurePreAgent() { + super.configurePreAgent() + injectSysConfig(TraceInstrumentationConfig.LEGACY_CONTEXT_MANAGER_ENABLED, "false") + } +} + class PekkoHttpServerInstrumentationBindAndHandleAsyncWithRouteAsyncHandlerTest extends PekkoHttpServerInstrumentationTest { @Override HttpServer server() { diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java new file mode 100644 index 00000000000..21fee39d54f --- /dev/null +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/java/datadog/trace/instrumentation/pekkohttp/SwappedContextScopeTest.java @@ -0,0 +1,43 @@ +package datadog.trace.instrumentation.pekkohttp; + +import static org.junit.jupiter.api.Assertions.assertSame; + +import datadog.context.Context; +import datadog.context.ContextKey; +import datadog.context.ContextScope; +import org.junit.jupiter.api.Test; + +class SwappedContextScopeTest { + private static final ContextKey KEY = ContextKey.named("pekko-http-swap-test"); + + @Test + void restoresPreviousContext() { + Context previous = Context.root().with(KEY, "previous"); + Context request = Context.root().with(KEY, "request"); + + try (ContextScope previousScope = previous.attach()) { + try (ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request)) { + assertSame(request, Context.current()); + } + assertSame(previous, Context.current()); + } + } + + @Test + void waitsUntilRequestContextIsCurrent() { + Context previous = Context.root().with(KEY, "previous"); + Context request = Context.root().with(KEY, "request"); + Context other = Context.root().with(KEY, "other"); + + try (ContextScope previousScope = previous.attach()) { + ContextScope requestScope = new DatadogWrapperHelper.SwappedContextScope(request); + try (ContextScope otherScope = other.attach()) { + requestScope.close(); + assertSame(other, Context.current()); + } + assertSame(request, Context.current()); + requestScope.close(); + assertSame(previous, Context.current()); + } + } +} diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala index 300e84478ad..7e070ac16a5 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/baseTest/scala/PekkoHttpTestWebServer.scala @@ -43,9 +43,12 @@ class PekkoHttpTestWebServer(binder: Binder) extends HttpServer { override def stop(): Unit = { import materializer.executionContext - portBinding - .flatMap(_.unbind()) - .onComplete(_ => system.terminate()) + Await.ready( + portBinding + .flatMap(_.unbind()) + .flatMap(_ => system.terminate()), + 10 seconds + ) } override def address(): URI = { diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java index 52075e732f9..0de81b07a08 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogServerRequestResponseFlowWrapper.java @@ -64,14 +64,11 @@ public GraphStageLogic createLogic(final Attributes inheritedAttributes) throws @Override public void onPush() throws Exception { final HttpRequest request = grab(requestInlet); - final ContextScope scope = DatadogWrapperHelper.createSpan(request); + final ContextScope scope = DatadogWrapperHelper.createSpanForFlow(request); scopes.add(scope); push(requestOutlet, request); - // Since we haven't instrumented the pekko stream state machine, we can't rely - // on spans and scopes being propagated during the push and pull of the - // element. Instead we let the scope leak intentionally here and clean it - // up when the user response comes back, or in the actor message processing - // instrumentation that drives this state machine. + // Legacy mode leaves the scope open so the surrounding actor can clean it up. + // Context-manager mode swaps the context and the actor restores it on exit. } @Override @@ -115,9 +112,7 @@ public void onPush() throws Exception { final ContextScope scope = scopes.poll(); if (scope != null) { DatadogWrapperHelper.finishSpan(scope.context(), response); - // Check if the active span matches the scope from when the request came in, - // and close it. If it's not, then it will be cleaned up actor message - // processing instrumentation that drives this state machine + // Legacy mode may still own the scope when the response arrives. AgentSpan activeSpan = activeSpan(); AgentSpan span = fromContext(scope.context()); if (activeSpan == span) { diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java index d4565c68bfc..3cee9b327b5 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/DatadogWrapperHelper.java @@ -5,19 +5,61 @@ import datadog.context.Context; import datadog.context.ContextScope; +import datadog.trace.api.InstrumenterConfig; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.apache.pekko.http.scaladsl.model.HttpRequest; import org.apache.pekko.http.scaladsl.model.HttpResponse; public class DatadogWrapperHelper { + private static final boolean LEGACY_CONTEXT_MANAGER_ENABLED = + InstrumenterConfig.get().isLegacyContextManagerEnabled(); + public static ContextScope createSpan(final HttpRequest request) { + return startSpan(request).attach(); + } + + public static ContextScope createSpanForFlow(final HttpRequest request) { + final Context context = startSpan(request); + if (LEGACY_CONTEXT_MANAGER_ENABLED) { + return context.attach(); + } + return new SwappedContextScope(context); + } + + private static Context startSpan(final HttpRequest request) { final Context parentContext = DECORATE.extract(request); final Context context = DECORATE.startSpan(request, parentContext); final AgentSpan span = fromContext(context); DECORATE.afterStart(span); DECORATE.onRequest(span, request, request, parentContext); - return context.attach(); + return context; + } + + static final class SwappedContextScope implements ContextScope { + private final Context context; + private final Context previousContext; + private final Thread ownerThread; + private boolean closed; + + SwappedContextScope(final Context context) { + this.context = context; + this.ownerThread = Thread.currentThread(); + this.previousContext = context.swap(); + } + + @Override + public Context context() { + return context; + } + + @Override + public void close() { + if (!closed && ownerThread == Thread.currentThread() && context == Context.current()) { + closed = true; + previousContext.swap(); + } + } } public static void finishSpan(final Context context, final HttpResponse response) { diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java index 9899e04f6af..55f78ffab6d 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttp2ServerInstrumentation.java @@ -42,6 +42,7 @@ public String[] knownMatchingTypes() { public String[] helperClassNames() { return new String[] { packageName + ".DatadogWrapperHelper", + packageName + ".DatadogWrapperHelper$SwappedContextScope", packageName + ".DatadogAsyncHandlerWrapper", packageName + ".DatadogAsyncHandlerWrapper$1", packageName + ".DatadogAsyncHandlerWrapper$2", diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java index bb74992b00c..e37c329c7a2 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpServerInstrumentation.java @@ -65,6 +65,7 @@ public String instrumentedType() { public String[] helperClassNames() { return new String[] { packageName + ".DatadogWrapperHelper", + packageName + ".DatadogWrapperHelper$SwappedContextScope", packageName + ".DatadogServerRequestResponseFlowWrapper", packageName + ".DatadogServerRequestResponseFlowWrapper$1", packageName + ".DatadogServerRequestResponseFlowWrapper$1$1", diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java index 1c85e382736..bde139cbbb3 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoHttpSingleRequestInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.pekkohttp.PekkoHttpClientDecorator.DECORATE; import static datadog.trace.instrumentation.pekkohttp.PekkoHttpClientDecorator.PEKKO_CLIENT_REQUEST; import static datadog.trace.instrumentation.pekkohttp.PekkoHttpClientDecorator.PEKKO_HTTP_CLIENT; @@ -13,10 +14,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import org.apache.pekko.http.scaladsl.HttpExt; @@ -67,7 +68,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class SingleRequestAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(value = 0, readOnly = false) HttpRequest request) { /* Versions 10.0 and 10.1 have slightly different structure that is hard to distinguish so here @@ -90,13 +91,13 @@ public static AgentScope methodEnter( public static void methodExit( @Advice.This final HttpExt thiz, @Advice.Return final Future responseFuture, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable == null) { responseFuture.onComplete(new OnCompleteHandler(span), thiz.system().dispatcher()); diff --git a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java index e4088a59f29..b4fb4627a14 100644 --- a/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java +++ b/dd-java-agent/instrumentation/pekko/pekko-http-1.0/src/main/java/datadog/trace/instrumentation/pekkohttp/PekkoPoolMasterActorInstrumentation.java @@ -5,9 +5,9 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; 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 net.bytebuddy.asm.Advice; @AutoService(InstrumenterModule.class) @@ -39,12 +39,12 @@ public void methodAdvice(MethodTransformer transformer) { public static class BlockPropagation { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter() { + public static ContextScope enter() { return activateSpan(noopSpan()); } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope scope) { + public static void exit(@Advice.Enter final ContextScope scope) { scope.close(); } } 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 f784aa0431d..f3447043003 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -77,8 +77,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.7=compileClasspath,testCompileClasspath,testRuntimeClasspath joda-time:joda-time:2.9.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -121,7 +121,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 fe325eb5f08..d4b59e8a27f 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -76,8 +76,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.9=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 c91deea3e4d..35770c3b3b5 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -75,8 +75,8 @@ javax.inject:javax.inject:1=compileClasspath,latestDepTestCompileClasspath,lates javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0a2c4e842bd..9bcb9f22918 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -66,8 +66,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.7=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -109,7 +109,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 05be2f1dc15..ad8463c5df0 100644 --- a/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.3/gradle.lockfile @@ -12,7 +12,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -33,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -108,8 +108,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.3=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.11=latestDepTestCompileClasspath,testCompileClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:3.4.0=latestDepTestCompileClasspath,testCompileClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -182,7 +182,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:1.9.5=latestDepTestCompileClasspath,testCompileClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=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 26e1edc6df6..f5f842bb92f 100644 --- a/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.4/gradle.lockfile @@ -12,7 +12,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -82,8 +82,8 @@ javax.transaction:jta:1.1=compileClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.7=compileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -127,7 +127,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 e67599e45fe..7ea9850195a 100644 --- a/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-2.6/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testFixturesCompileClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -103,8 +103,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.9=compileClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath,testFixturesCompileClasspath junit:junit:4.13.2=testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:4.1.0=testCompileClasspath,testFixturesCompileClasspath net.java.dev.jna:jna-platform:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:4.1.0=testCompileClasspath,testFixturesCompileClasspath @@ -169,7 +169,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testFixturesRuntimeClasspath,tes org.junit.platform:junit-platform-suite-api:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.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 82e0d7ade97..f13d8380484 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -39,8 +39,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -152,8 +152,8 @@ joda-time:joda-time:2.9.2=compileClasspath,testCompileClasspath,testRuntimeClass joda-time:joda-time:2.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath junit:junit:4.12=latestDepTestCompileClasspath,testCompileClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:4.1.0=latestDepTestCompileClasspath,testCompileClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:4.1.0=latestDepTestCompileClasspath,testCompileClasspath @@ -233,7 +233,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 103ba686b89..836ee9ef36a 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 @@ -11,7 +11,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -103,8 +103,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.9=compileClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.12=testCompileClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:4.1.0=testCompileClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:4.1.0=testCompileClasspath @@ -169,7 +169,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.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 32283fa9938..24f072b0137 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 @@ -14,7 +14,7 @@ ch.qos.logback:logback-core:1.5.32=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -46,8 +46,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -186,8 +186,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.1=compileClasspath junit:junit:4.12=testCompileClasspath junit:junit:4.13.2=latestDepTestCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jodah:typetools:0.5.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -266,7 +266,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 9ac3446aada..bc77343b2bf 100644 --- a/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/play/play-appsec-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile index 299beea031e..b71ba82f739 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/quartz-2.0/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath @@ -23,8 +23,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,version40TestAnnotationProcessor @@ -60,8 +60,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.transaction:jta:1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,version40TestRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,version40TestCompileClasspath,version40TestRuntimeClasspath diff --git a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java index aa7993b8639..7ea735da6e0 100644 --- a/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java +++ b/dd-java-agent/instrumentation/quartz-2.0/src/main/java/datadog/trace/instrumentation/quartz/QuartzSchedulingInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.quartz.QuartzDecorator.DECORATE; import static datadog.trace.instrumentation.quartz.QuartzDecorator.SCHEDULED_CALL; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -11,9 +12,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import net.bytebuddy.description.type.TypeDescription; @@ -55,7 +56,7 @@ public String[] helperClassNames() { public static class QuartzSchedulingAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.Argument(0) JobExecutionContext context) { + public static ContextScope enter(@Advice.Argument(0) JobExecutionContext context) { // create a new trace for every job final AgentSpan span = startSpan("quartz", SCHEDULED_CALL, null); DECORATE.afterStart(span); @@ -65,8 +66,8 @@ public static AgentScope enter(@Advice.Argument(0) JobExecutionContext context) @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { - final AgentSpan span = scope.span(); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); } 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 e26d1cadabc..c49b4ab07a6 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,latestReactorTestAnnotationProcessor,reactorTestAnnotationProcessor,testAnnotationProcessor @@ -49,7 +49,7 @@ com.google.re2j:re2j:1.8=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.35.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.rabbitmq:amqp-client:5.36.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 @@ -64,17 +64,17 @@ commons-io:commons-io:2.21.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.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-base:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-compression:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-marshalling:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-protobuf:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-common:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-handler:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-resolver:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.2.17.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-marshalling:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-protobuf:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.18.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.18.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 @@ -83,8 +83,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,latestReactorTestRuntim javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,muzzleTooling,reactorTestCompileClasspath,reactorTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -127,7 +127,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,la org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,latestReactorTestRuntimeClasspath,reactorTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestReactorTestCompileClasspath,latestReactorTestRuntimeClasspath,reactorTestCompileClasspath,reactorTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java index 2780015a5bf..eddf53c1241 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/RabbitChannelInstrumentation.java @@ -14,6 +14,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.CLIENT_DECORATE; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.CONSUMER_DECORATE; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.OPERATION_AMQP_COMMAND; @@ -38,6 +39,7 @@ import com.rabbitmq.client.Consumer; import com.rabbitmq.client.GetResponse; import com.rabbitmq.client.MessageProperties; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; @@ -45,7 +47,6 @@ import datadog.trace.api.datastreams.DataStreamsContext; import datadog.trace.api.datastreams.DataStreamsTags; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; import java.util.HashMap; @@ -122,7 +123,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ChannelMethodAdvice { @Advice.OnMethodEnter - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final Channel channel, @Advice.Origin("Channel.#m") final String method) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class); if (callDepth > 0) { @@ -141,21 +142,21 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } CLIENT_DECORATE.onError(scope, throwable); CLIENT_DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); CallDepthThreadLocalMap.reset(Channel.class); } } public static class ChannelPublishAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope setResourceNameAddHeaders( + public static ContextScope setResourceNameAddHeaders( @Advice.This final Channel channel, @Advice.Argument(0) final String exchange, @Advice.Argument(1) final String routingKey, @@ -185,14 +186,14 @@ public static AgentScope setResourceNameAddHeaders( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } PRODUCER_DECORATE.onError(scope, throwable); PRODUCER_DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); CallDepthThreadLocalMap.reset(Channel.class); } } @@ -253,7 +254,7 @@ public static void onEnter( public static class ChannelGetAdvice { @Advice.OnMethodEnter public static long takeTimestamp( - @Advice.Local("placeholderScope") AgentScope placeholderScope, + @Advice.Local("placeholderScope") ContextScope placeholderScope, @Advice.Local("callDepth") int callDepth) { callDepth = CallDepthThreadLocalMap.incrementCallDepth(Channel.class); @@ -267,7 +268,7 @@ public static void extractAndStartSpan( @Advice.This final Channel channel, @Advice.Argument(0) final String queue, @Advice.Enter final long spanStartMillis, - @Advice.Local("placeholderScope") final AgentScope placeholderScope, + @Advice.Local("placeholderScope") final ContextScope placeholderScope, @Advice.Local("callDepth") final int callDepth, @Advice.Return final GetResponse response, @Advice.Thrown final Throwable throwable) { @@ -280,14 +281,14 @@ public static void extractAndStartSpan( final boolean propagate = config.isRabbitPropagationEnabled() && !config.isRabbitPropagationDisabledForDestination(queue); - final AgentScope scope = + final ContextScope scope = RabbitDecorator.startReceivingSpan( propagate, spanStartMillis, null != response ? response.getProps() : null, null != response ? response.getBody() : null, queue); - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); CONSUMER_DECORATE.setPeerPort(span, connection.getPort()); CONSUMER_DECORATE.onGet(span, queue); CONSUMER_DECORATE.onPeerConnection(span, connection.getAddress()); 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 e73bf99c34a..e3741e76d11 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 @@ -11,16 +11,17 @@ import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.AMQP_QUEUE; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.AMQP_ROUTING_KEY; import static datadog.trace.bootstrap.instrumentation.api.InstrumentationTags.RECORD_QUEUE_TIME_MS; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.api.ServiceNameSources.MESSAGE_BROKER_SPLIT_BY_DESTINATION; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Command; import com.rabbitmq.client.Consumer; import com.rabbitmq.client.Envelope; +import datadog.context.ContextScope; import datadog.trace.api.Config; 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.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -196,7 +197,7 @@ public TracedDelegatingConsumer wrapConsumer(String queue, Consumer consumer) { return new TracedDelegatingConsumer(queue, consumer); } - public static AgentScope startReceivingSpan( + public static ContextScope startReceivingSpan( boolean propagate, long spanStartMillis, AMQP.BasicProperties properties, @@ -259,15 +260,15 @@ public static AgentScope startReceivingSpan( } CONSUMER_DECORATE.afterStart(span); - AgentScope scope = activateSpan(span); + ContextScope scope = activateSpan(span); if (null != queueSpan) { queueSpan.finish(spanStartMicros); } return scope; } - public static void finishReceivingSpan(AgentScope scope) { - AgentSpan span = scope.span(); + public static void finishReceivingSpan(ContextScope scope) { + AgentSpan span = spanFromScope(scope); scope.close(); if (CONSUMER_DECORATE.endToEndDurationsEnabled) { span.finishWithEndToEnd(); diff --git a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java index 314a3cc1af7..35008f303f5 100644 --- a/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java +++ b/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/src/main/java/datadog/trace/instrumentation/rabbitmq/amqp/TracedDelegatingConsumer.java @@ -1,14 +1,15 @@ package datadog.trace.instrumentation.rabbitmq.amqp; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.rabbitmq.amqp.RabbitDecorator.CONSUMER_DECORATE; import com.rabbitmq.client.AMQP; import com.rabbitmq.client.Consumer; import com.rabbitmq.client.Envelope; import com.rabbitmq.client.ShutdownSignalException; +import datadog.context.ContextScope; import datadog.trace.api.Config; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.io.IOException; import org.slf4j.Logger; @@ -65,10 +66,10 @@ public void handleDelivery( final AMQP.BasicProperties properties, final byte[] body) throws IOException { - AgentScope scope = null; + ContextScope scope = null; try { scope = RabbitDecorator.startReceivingSpan(propagate, 0, properties, body, queue); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); CONSUMER_DECORATE.onDeliver(span, queue, envelope); scope = activateSpan(span); } catch (final Exception e) { diff --git a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile index 23091f9e38f..bd14e227843 100644 --- a/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/ratpack-1.5/gradle.lockfile @@ -11,7 +11,7 @@ com.beust:jcommander:1.72=latestDepTestRuntimeClasspath 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-instrument-java:0.0.5=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 @@ -40,8 +40,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -125,8 +125,8 @@ jaxen:jaxen:2.0.6=spotbugs jline:jline:2.14.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath junit:junit:4.12=latestDepTestCompileClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -196,7 +196,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 820a943b40b..38987a7fd2b 100644 --- a/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactive-streams-1.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -101,7 +101,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 68948154245..fe0d33605eb 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-core-3.1/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -66,8 +66,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -110,7 +110,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy index 09823e83e9e..b38f22902c4 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/latestDepTest/groovy/ReactorCoreTest.groovy @@ -1,6 +1,6 @@ import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.Trace -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.opentelemetry.api.GlobalOpenTelemetry @@ -304,7 +304,7 @@ class ReactorCoreTest extends InstrumentationSpecification { Publisher publisher = publisherSupplier() AgentSpan intermediate = startSpan("test", "intermediate") - AgentScope scope = activateSpan(intermediate) + ContextScope scope = activateSpan(intermediate) try { if (publisher instanceof Mono) { return ((Mono) publisher).map(addTwo) @@ -564,7 +564,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { final AgentSpan span = startSpan("test", "publisher-parent") - AgentScope scope = activateSpan(span) + ContextScope scope = activateSpan(span) def publisher = publisherSupplier() publisher.subscribe(new Subscriber() { diff --git a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy index f2654e4e1a4..acc7a8f1b27 100644 --- a/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy +++ b/dd-java-agent/instrumentation/reactor-core-3.1/src/test/groovy/ReactorCoreTest.groovy @@ -1,6 +1,6 @@ import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.Trace -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.opentelemetry.api.GlobalOpenTelemetry @@ -304,7 +304,7 @@ class ReactorCoreTest extends InstrumentationSpecification { Publisher publisher = publisherSupplier() AgentSpan intermediate = startSpan("test", "intermediate") - AgentScope scope = activateSpan(intermediate) + ContextScope scope = activateSpan(intermediate) try { if (publisher instanceof Mono) { return ((Mono) publisher).map(addTwo) @@ -564,7 +564,7 @@ class ReactorCoreTest extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { final AgentSpan span = startSpan("test", "publisher-parent") - AgentScope scope = activateSpan(span) + ContextScope scope = activateSpan(span) def publisher = publisherSupplier() publisher.subscribe(new Subscriber() { 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 c7310c5e5d6..8566c4565e0 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -96,8 +96,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -139,7 +139,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java b/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java index 7ecca93164d..412127622de 100644 --- a/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java +++ b/dd-java-agent/instrumentation/reactor-netty-1.0/src/test/java/ReactorNettyBaggagePropagationTest.java @@ -5,7 +5,6 @@ import datadog.context.Context; 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 datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.bootstrap.instrumentation.api.Baggage; @@ -82,7 +81,7 @@ void baggageHeaderPropagatedOnOutgoingRequest() { Baggage baggage = Baggage.create(Collections.singletonMap("user.id", "abc123")); AgentSpan span = AgentTracer.startSpan("test", "parent"); - try (AgentScope spanScope = AgentTracer.activateSpan(span)) { + try (ContextScope spanScope = AgentTracer.activateSpan(span)) { // Active context now carries both the span and the baggage — the exact shape the connect-span // path must carry across the subscription -> I/O thread hand-off. try (ContextScope baggageScope = Context.current().with(baggage).attach()) { diff --git a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile index afd4e2675d7..48a6dfa52e2 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/rediscala-1.8/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -25,8 +25,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java index 0dd5e434c21..8ca0e477e9d 100644 --- a/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java +++ b/dd-java-agent/instrumentation/rediscala-1.8/src/main/java/datadog/trace/instrumentation/rediscala/RediscalaInstrumentation.java @@ -5,6 +5,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.rediscala.RediscalaClientDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -13,12 +14,12 @@ import akka.actor.ActorRef; 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.agent.tooling.bytebuddy.matcher.NameMatchers; 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 java.util.Collections; import java.util.Map; @@ -83,7 +84,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RediscalaAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.Argument(0) final RedisCommand cmd) { + public static ContextScope onEnter(@Advice.Argument(0) final RedisCommand cmd) { final AgentSpan span = startSpan("redis-command", RediscalaClientDecorator.OPERATION_NAME); DECORATE.afterStart(span); DECORATE.onStatement(span, DECORATE.className(cmd.getClass())); @@ -92,13 +93,13 @@ public static AgentScope onEnter(@Advice.Argument(0) final RedisCommand cmd) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.This final Object thiz, @Advice.FieldValue("executionContext") final ExecutionContext ctx, @Advice.Return(readOnly = false) final Future responseFuture) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); final ContextStore contextStore = InstrumentationContext.get(ActorRef.class, RedisConnectionInfo.class); ActorRef connection = null; 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 5b179ae8212..fe758e2c280 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -37,8 +37,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -86,8 +86,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath @@ -135,7 +135,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java index 6a688940065..c166fb19c64 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.0.0/src/main/java/datadog/trace/instrumentation/redisson/RedissonInstrumentation.java @@ -9,9 +9,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.util.ArrayList; import java.util.List; @@ -60,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RedissonCommandAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandData command, @Advice.This RedisConnection thiz) { if (command.getPromise() == null) { return null; @@ -74,7 +74,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } @@ -84,7 +84,7 @@ public static void after(@Advice.Enter final AgentScope scope) { public static class RedissonCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) { if (command.getPromise() == null) { return null; @@ -104,7 +104,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 4d48c100d99..0de54ae9340 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -93,8 +93,8 @@ javax.cache:cache-api:1.0.0=latestDepForkedTestCompileClasspath,latestDepForkedT javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.5=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -145,7 +145,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java index b044e959aa3..3d6b8ab8354 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-2.3.0/src/main/java/datadog/trace/instrumentation/redisson23/RedissonInstrumentation.java @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.util.ArrayList; import java.util.List; @@ -60,7 +60,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RedissonCommandAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandData command, @Advice.This RedisConnection thiz) { if (command.getPromise() == null) { return null; @@ -75,7 +75,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } @@ -85,7 +85,7 @@ public static void after(@Advice.Enter final AgentScope scope) { public static class RedissonCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) { if (command.getPromise() == null) { return null; @@ -106,7 +106,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 1db2f02435a..9b78439899d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -44,8 +44,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -104,8 +104,8 @@ javax.cache:cache-api:1.1.1=latestDepForkedTestCompileClasspath,latestDepForkedT javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -156,7 +156,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:2.5.1=compileClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java index 15ff0d6416b..85e5f4aaa6e 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/main/java/datadog/trace/instrumentation/redisson30/RedissonInstrumentation.java @@ -8,9 +8,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.util.ArrayList; import java.util.List; @@ -63,7 +63,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class RedissonCommandAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandData command, @Advice.This RedisConnection thiz) { final CompletionStage promise = PromiseHelper.getPromise(PromiseHelper.COMMAND_GET_PROMISE_HANDLE, command); @@ -79,7 +79,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } @@ -94,7 +94,7 @@ public static void muzzleCheck(final RTransaction b) { public static class RedissonCommandsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandsData command, @Advice.This final RedisConnection thiz) { final CompletionStage promise = PromiseHelper.getPromise(PromiseHelper.COMMANDS_GET_PROMISE_HANDLE, command); @@ -115,7 +115,7 @@ public static AgentScope onEnter( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } diff --git a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy index 2a120850a1d..d1292ab48fd 100644 --- a/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy +++ b/dd-java-agent/instrumentation/redisson/redisson-3.10.3/src/test/groovy/RedissonClientTest.groovy @@ -42,8 +42,11 @@ abstract class RedissonClientTest extends VersionedNamingTestBase { } def cleanupSpec() { - redisServer.stop() - redissonClient.shutdown() + try { + redissonClient.shutdown() + } finally { + redisServer.stop() + } } def setup() { diff --git a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile index c890e2d1389..aa83d7ca960 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile +++ b/dd-java-agent/instrumentation/renaissance-0.7/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java index b77b9f983d8..5364853ecc5 100644 --- a/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java +++ b/dd-java-agent/instrumentation/renaissance-0.7/src/main/java/datadog/trace/instrumentation/renaissance/RenaissanceInstrumentation.java @@ -3,13 +3,14 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 net.bytebuddy.asm.Advice; import org.slf4j.Logger; @@ -43,7 +44,7 @@ protected boolean defaultEnabled() { public static final class BenchmarkAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) int index, @Advice.FieldValue("benchmarkName") String benchmarkName) { AgentSpan span = startSpan("renaissance", "renaissance.benchmark").setResourceName(benchmarkName); @@ -52,9 +53,9 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 2f14e830f05..15b49068759 100644 --- a/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resilience4j/resilience4j-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -76,8 +76,8 @@ javax.cache:cache-api:1.1.0=compileClasspath,latestDepTestCompileClasspath,lates javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.latencyutils:LatencyUtils:2.0.3=latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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 6d4553508d1..98236acbe1c 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,7 +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; import io.github.resilience4j.core.functions.CheckedConsumer; @@ -308,7 +307,7 @@ protected WrapperWithContext(Resilience4jSpanDecorator spanDecorator, T data) this.data = data; } - public AgentScope activateScope() { + public ContextScope activateScope() { AgentSpan current = Resilience4jSpan.current(); AgentSpan owned = current == null ? Resilience4jSpan.start() : null; if (owned != null) { 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 64ca1fed37c..5a34d30594a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -79,8 +79,8 @@ javax.cache:cache-api:1.1.0=compileClasspath,latestDepTestCompileClasspath,lates javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -122,7 +122,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.latencyutils:LatencyUtils:2.0.3=latestDepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=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 d648063fd48..44dd4f42ffc 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=compileClasspath @@ -109,7 +109,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java index df54ac159bd..bf9559671c8 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.0/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy30RequestContextInstrumentation.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.jaxrs2; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.lang.reflect.Method; import javax.ws.rs.container.ContainerRequestContext; import net.bytebuddy.asm.Advice; @@ -24,7 +24,8 @@ public class Resteasy30RequestContextInstrumentation extends AbstractRequestCont public static class ContainerRequestContextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) { + public static ContextScope decorateAbortSpan( + @Advice.This final ContainerRequestContext context) { if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null && context instanceof PostMatchContainerRequestContext) { @@ -41,7 +42,7 @@ public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestCo @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { RequestFilterHelper.closeSpanAndScope(scope, throwable); } } 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 0131ce23698..278e051d30c 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -60,8 +60,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=compileClasspath @@ -110,7 +110,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java index bf302acccc0..e2c5f5d7322 100644 --- a/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/filter-resteasy/filter-resteasy-3.1/src/main/java/datadog/trace/instrumentation/jaxrs2/Resteasy31RequestContextInstrumentation.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.jaxrs2; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import java.lang.reflect.Method; import javax.ws.rs.container.ContainerRequestContext; import net.bytebuddy.asm.Advice; @@ -23,7 +23,8 @@ public class Resteasy31RequestContextInstrumentation extends AbstractRequestContextInstrumentation { public static class ContainerRequestContextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestContext context) { + public static ContextScope decorateAbortSpan( + @Advice.This final ContainerRequestContext context) { if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null && context instanceof PostMatchContainerRequestContext) { @@ -40,7 +41,7 @@ public static AgentScope decorateAbortSpan(@Advice.This final ContainerRequestCo @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { RequestFilterHelper.closeSpanAndScope(scope, throwable); } } 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 32d99d8f49e..5e7fb492d29 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/resteasy/resteasy-3.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -61,8 +61,8 @@ javax.annotation:jsr250-api:1.0=compileClasspath,testCompileClasspath,testRuntim javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath @@ -109,7 +109,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java index 6cb2eb998ca..23979a9e36f 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/DecodedFormParametersInstrumentation.java @@ -134,7 +134,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (for getDecodedFormParameters)"); requestContext.getTraceSegment().effectivelyBlocked(); } diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java index a9e5ec578c7..4ea7de926af 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MessageBodyReaderInvocationInstrumentation.java @@ -80,7 +80,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException( "Blocked request (for AbstractReaderInterceptorContext/readFrom)"); diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java index 524f280bf44..8dadbd820e0 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MethodExpressionInstrumentation.java @@ -80,7 +80,7 @@ static void after( Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction blockResponseFunction = reqCtx.getBlockResponseFunction(); if (blockResponseFunction != null) { - blockResponseFunction.tryCommitBlockingResponse(reqCtx.getTraceSegment(), rba); + blockResponseFunction.tryCommitBlockingResponse(reqCtx, rba); t = new BlockingException("Blocked request (for MethodExpression/populatePathParams)"); reqCtx.getTraceSegment().effectivelyBlocked(); } diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java index fc86e8ce7f3..b63333d8c4b 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/main/java/datadog/trace/instrumentation/resteasy/MultipartHelper.java @@ -240,7 +240,7 @@ public static BlockingException tryBlock(RequestContext ctx, Flow flow, St Flow.Action.RequestBlockingAction rba = (Flow.Action.RequestBlockingAction) action; BlockResponseFunction brf = ctx.getBlockResponseFunction(); if (brf != null) { - brf.tryCommitBlockingResponse(ctx.getTraceSegment(), rba); + brf.tryCommitBlockingResponse(ctx, rba); BlockingException be = new BlockingException(message); ctx.getTraceSegment().effectivelyBlocked(); return be; diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/test/groovy/MultipartHelperTest.groovy b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/test/groovy/MultipartHelperTest.groovy index c76dafb19f6..2669b98f2e8 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/test/groovy/MultipartHelperTest.groovy +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/test/groovy/MultipartHelperTest.groovy @@ -587,7 +587,7 @@ class MultipartHelperTest extends Specification { MultipartHelper.tryBlock(ctx, flow, 'msg') then: - 1 * brf.tryCommitBlockingResponse(segment, rba) + 1 * brf.tryCommitBlockingResponse(ctx, rba) 1 * segment.effectivelyBlocked() } diff --git a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/resteasy/AbstractResteasyAppsecTest.groovy b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/resteasy/AbstractResteasyAppsecTest.groovy index 54e32255fe3..35d88993394 100644 --- a/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/resteasy/AbstractResteasyAppsecTest.groovy +++ b/dd-java-agent/instrumentation/resteasy/resteasy-appsec-3.0/src/testFixtures/groovy/datadog/trace/instrumentation/resteasy/AbstractResteasyAppsecTest.groovy @@ -5,11 +5,14 @@ import datadog.appsec.api.blocking.BlockingException import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.agent.test.base.HttpServerTest import datadog.trace.agent.test.utils.OkHttpUtils +import datadog.trace.api.appsec.AppSecContext import datadog.trace.api.function.TriConsumer +import datadog.trace.api.gateway.BlockResponseFunction import datadog.trace.api.gateway.Events import datadog.trace.api.gateway.Flow import datadog.trace.api.gateway.RequestContext import datadog.trace.api.gateway.RequestContextSlot +import datadog.trace.api.internal.TraceSegment import datadog.trace.bootstrap.instrumentation.api.AgentTracer import okhttp3.HttpUrl import okhttp3.MultipartBody @@ -53,8 +56,12 @@ abstract class AbstractResteasyAppsecTest extends InstrumentationSpecification { abstract void startServer() abstract void stopServer() - static class TestCtx { + static class TestCtx implements AppSecContext { + /** Set from the last request that reported a block failure. Reset by each test that reads it. */ + static volatile boolean blockFailureReported + boolean block + boolean failBlocking Flow getFlow() { if (block) { @@ -63,6 +70,39 @@ abstract class AbstractResteasyAppsecTest extends InstrumentationSpecification { Flow.ResultFlow.empty() } } + + @Override + boolean isManuallyKept() { + false + } + + @Override + void reportBlockFailure() { + blockFailureReported = true + } + } + + /** Simulates a server that cannot commit the blocking response. */ + enum FailingBlockResponseFunction implements BlockResponseFunction { + INSTANCE + + @Override + boolean tryCommitBlockingResponse(TraceSegment segment, int statusCode, BlockingContentType templateType, + Map extraHeaders, String securityResponseId) { + false + } + } + + /** + * Replaces the server's block response function with one that fails to commit, so that the + * instrumentation reports a block failure on the AppSec context. + */ + static Flow flowWithOptionalBlockFailure(RequestContext ctx) { + TestCtx testCtx = ctx.getData(RequestContextSlot.APPSEC) + if (testCtx.failBlocking) { + ctx.blockResponseFunction = FailingBlockResponseFunction.INSTANCE + } + testCtx.flow } enum BlockingFlow implements Flow { @@ -83,18 +123,20 @@ abstract class AbstractResteasyAppsecTest extends InstrumentationSpecification { if (name == 'x-block') { TestCtx testCtx = ctx.getData(RequestContextSlot.APPSEC) testCtx.block = true + } else if (name == 'x-block-fail') { + TestCtx testCtx = ctx.getData(RequestContextSlot.APPSEC) + testCtx.block = true + testCtx.failBlocking = true } } as TriConsumer) ig.registerCallback(events.requestStarted(), { -> new Flow.ResultFlow(new TestCtx()) } as Supplier>) ig.registerCallback(events.requestBodyProcessed(), { RequestContext ctx, Object obj -> ctx.traceSegment.setTagTop('request.body.converted', obj as String) - TestCtx testCtx = ctx.getData(RequestContextSlot.APPSEC) - testCtx.flow + flowWithOptionalBlockFailure(ctx) } as BiFunction>) ig.registerCallback(events.requestPathParams(), { RequestContext ctx, Map stringMap -> ctx.traceSegment.setTagTop('request.path_params', stringMap as String) - TestCtx testCtx = ctx.getData(RequestContextSlot.APPSEC) - testCtx.flow + flowWithOptionalBlockFailure(ctx) } as BiFunction, Flow>) startServer() @@ -244,6 +286,71 @@ abstract class AbstractResteasyAppsecTest extends InstrumentationSpecification { } != null } + def 'test block failure is reported for path params when the blocking response cannot be committed'() { + setup: + TestCtx.blockFailureReported = false + def url = HttpUrl.get(address.resolve('/paramString/foobar')) + def request = new Request.Builder().url(url) + .header('x-block-fail', 'true') + .method('GET', null).build() + + when: + def response = executeIgnoringIoErrors(request) + + then: + response == null || response.code() != 403 + TestCtx.blockFailureReported + } + + def 'test block failure is reported for urlencoded request body when the blocking response cannot be committed'() { + setup: + TestCtx.blockFailureReported = false + def request = request( + BODY_URLENCODED, 'POST', + RequestBody.create(okhttp3.MediaType.get('application/x-www-form-urlencoded'), 'a=x')) + .header('x-block-fail', 'true') + .build() + + when: + def response = executeIgnoringIoErrors(request) + + then: + response == null || response.code() != 403 + TestCtx.blockFailureReported + } + + def 'test block failure is reported for json request body when the blocking response cannot be committed'() { + setup: + TestCtx.blockFailureReported = false + def request = request( + BODY_JSON, 'POST', + RequestBody.create(okhttp3.MediaType.get('application/json'), '{"a":"x"}\n')) + .header('x-block-fail', 'true') + .build() + + when: + def response = executeIgnoringIoErrors(request) + + then: + response == null || response.code() != 403 + TestCtx.blockFailureReported + } + + /** + * When the blocking response cannot be committed the server has no response to write, so the + * connection may be closed without a complete HTTP response. + */ + private okhttp3.Response executeIgnoringIoErrors(Request request) { + try { + def response = client.newCall(request).execute() + response.body().bytes() + response.close() + response + } catch (IOException ignored) { + null + } + } + def 'test instrumentation gateway multipart request body endpoint #endpoint'() { setup: def url = HttpUrl.get(address.resolve(endpoint)) diff --git a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile index 1acb1dbe2ca..9de2141d28d 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/restlet-2.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=baseForkedTestCompileClasspath,baseForkedTest com.blogspot.mydailyjava:weak-lock-free:0.17=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeCl javax.servlet:javax.servlet-api:3.1.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=baseForkedTestRuntimeClasspath,l org.junit.platform:junit-platform-suite-api:1.14.1=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=baseForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=baseForkedTestCompileClasspath,baseForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java index b38af4491e7..809e1069ddb 100644 --- a/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java +++ b/dd-java-agent/instrumentation/restlet-2.2/src/main/java/datadog/trace/instrumentation/restlet/ResourceInstrumentation.java @@ -5,6 +5,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.restlet.ResourceDecorator.DECORATE; import static datadog.trace.instrumentation.restlet.ResourceDecorator.RESTLET_CONTROLLER; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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 net.bytebuddy.asm.Advice; import org.restlet.engine.resource.AnnotationInfo; @@ -58,7 +59,7 @@ public String[] helperClassNames() { public static class ResourceHandleAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.This final ServerResource serverResource, @Advice.Argument(0) final AnnotationInfo annotationInfo) { final AgentSpan parent = activeSpan(); @@ -73,8 +74,8 @@ public static AgentScope beginRequest( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { - AgentSpan span = scope.span(); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); diff --git a/dd-java-agent/instrumentation/robolectric-4.13/build.gradle b/dd-java-agent/instrumentation/robolectric-4.13/build.gradle index 2ac5d08d097..c9cd551e9e1 100644 --- a/dd-java-agent/instrumentation/robolectric-4.13/build.gradle +++ b/dd-java-agent/instrumentation/robolectric-4.13/build.gradle @@ -7,10 +7,13 @@ muzzle { pass { group = 'org.robolectric' module = 'robolectric' - versions = '[4.13,4.17)' + versions = '[4.13,)' // androidx.test:monitor is an Android archive (.aar) that a JVM configuration cannot consume; // it is not referenced by the advice/helper. Mirror the compileOnly exclusion below. excludeDependency 'androidx.test:monitor' + // Robolectric loads the selected Android SDK dynamically, so android-all is not a transitive + // dependency even though android.os.Build is available when the helper runs. + extraDependency 'org.robolectric:android-all:14-robolectric-10818077' } } @@ -32,6 +35,7 @@ dependencies { compileOnly(group: 'org.robolectric', name: 'robolectric', version: '4.16.1') { exclude group: 'androidx.test', module: 'monitor' } + compileOnly group: 'org.robolectric', name: 'android-all', version: '14-robolectric-10818077' // RobolectricTestRunner extends JUnit's BlockJUnit4ClassRunner; JUnit must be on the compile // classpath so its supertypes resolve (both javac and forbiddenApis walk the class hierarchy). compileOnly group: 'junit', name: 'junit', version: '4.13.2' diff --git a/dd-java-agent/instrumentation/robolectric-4.13/gradle.lockfile b/dd-java-agent/instrumentation/robolectric-4.13/gradle.lockfile index 721b02f69ba..78df2f59dfe 100644 --- a/dd-java-agent/instrumentation/robolectric-4.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/robolectric-4.13/gradle.lockfile @@ -10,7 +10,7 @@ com.almworks.sqlite4java:sqlite4java:1.0.392=compileClasspath 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -23,8 +23,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -63,8 +63,8 @@ javax.inject:javax.inject:1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -106,7 +106,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath @@ -119,6 +118,7 @@ org.ow2.asm:asm-tree:9.8=compileClasspath org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm-util:9.7.1=testRuntimeClasspath org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.robolectric:android-all:14-robolectric-10818077=compileClasspath org.robolectric:annotations:4.16.1=compileClasspath org.robolectric:junit:4.16.1=compileClasspath org.robolectric:nativeruntime:4.16.1=compileClasspath diff --git a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java index 8396ddc8c2d..90ee48a41b9 100644 --- a/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java +++ b/dd-java-agent/instrumentation/robolectric-4.13/src/main/java/datadog/trace/instrumentation/robolectric/RobolectricTestAnnotator.java @@ -1,5 +1,6 @@ package datadog.trace.instrumentation.robolectric; +import android.os.Build; import datadog.trace.api.gateway.RequestContext; import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; @@ -13,7 +14,6 @@ import java.util.regex.Pattern; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.versioning.AndroidVersions; public final class RobolectricTestAnnotator { @@ -40,10 +40,10 @@ public static void annotate() { } span.setTag(Tags.TEST_ANDROID_API_LEVEL, apiLevel); - AndroidVersions.AndroidRelease release = AndroidVersions.getReleaseForSdkInt(apiLevel); - if (release != null) { - span.setTag(Tags.TEST_ANDROID_RELEASE, release.getVersion()); - span.setTag(Tags.TEST_ANDROID_CODENAME, release.getShortCode()); + span.setTag(Tags.TEST_ANDROID_RELEASE, Build.VERSION.RELEASE); + String androidCodename = androidCodename(apiLevel); + if (androidCodename != null) { + span.setTag(Tags.TEST_ANDROID_CODENAME, androidCodename); } String robolectricVersion = robolectricVersion(); if (robolectricVersion != null) { @@ -51,6 +51,87 @@ public static void annotate() { } } + private static String androidCodename(int apiLevel) { + switch (apiLevel) { + case 1: + return "BASE"; + case 2: + return "BASE_1_1"; + case 3: + return "CUPCAKE"; + case 4: + return "DONUT"; + case 5: + return "ECLAIR"; + case 6: + return "ECLAIR_0_1"; + case 7: + return "ECLAIR_MR1"; + case 8: + return "FROYO"; + case 9: + return "GINGERBREAD"; + case 10: + return "GINGERBREAD_MR1"; + case 11: + return "HONEYCOMB"; + case 12: + return "HONEYCOMB_MR1"; + case 13: + return "HONEYCOMB_MR2"; + case 14: + return "ICE_CREAM_SANDWICH"; + case 15: + return "ICE_CREAM_SANDWICH_MR1"; + case 16: + return "JELLY_BEAN"; + case 17: + return "JELLY_BEAN_MR1"; + case 18: + return "JELLY_BEAN_MR2"; + case 19: + return "KITKAT"; + case 20: + return "KITKAT_WATCH"; + case 21: + return "LOLLIPOP"; + case 22: + return "LOLLIPOP_MR1"; + case 23: + return "M"; + case 24: + return "N"; + case 25: + return "N_MR1"; + case 26: + return "O"; + case 27: + return "O_MR1"; + case 28: + return "P"; + case 29: + return "Q"; + case 30: + return "R"; + case 31: + return "S"; + case 32: + return "S_V2"; + case 33: + return "TIRAMISU"; + case 34: + return "UPSIDE_DOWN_CAKE"; + case 35: + return "VANILLA_ICE_CREAM"; + case 36: + return "BAKLAVA"; + case 37: + return "CINNAMON_BUN"; + default: + return null; + } + } + private static String robolectricVersion() { try { // RuntimeEnvironment is re-loaded by the sandbox classloader with no CodeSource, but the 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 b302d697802..ba60392924a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepJava11TestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepJava11TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=latestDepJava11TestCompileClasspath, javax.servlet:javax.servlet-api:3.1.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepJava11TestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepJava11TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepJava11TestCompileClasspath,latestDepJava11TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java index ec65e37549e..ceced5726ba 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/DefaultRequestContextInstrumentation.java @@ -3,13 +3,14 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.JAKARTA_RS_CONTROLLER; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.JAKARTA_RS_REQUEST_ABORT; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import jakarta.ws.rs.container.ContainerRequestContext; import java.lang.reflect.Method; @@ -28,7 +29,8 @@ public class DefaultRequestContextInstrumentation extends AbstractRequestContextInstrumentation { public static class ContainerRequestContextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope createGenericSpan(@Advice.This final ContainerRequestContext context) { + public static ContextScope createGenericSpan( + @Advice.This final ContainerRequestContext context) { if (context.getProperty(JakartaRsAnnotationsDecorator.ABORT_HANDLED) == null) { final AgentSpan parent = activeSpan(); @@ -49,7 +51,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo // can only be aborted inside the filter method } - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onJakartaRsSpan(span, parent, filterClass, method); @@ -62,12 +64,12 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); } diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java index d7fbe26311d..c0c2ec9031c 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/JakartaRsAnnotationsInstrumentation.java @@ -10,18 +10,19 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.JAKARTA_RS_CONTROLLER; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; 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.api.InstrumenterConfig; 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 jakarta.ws.rs.container.AsyncResponse; import java.lang.reflect.Method; @@ -91,7 +92,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JakartaRsAnnotationsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope nameSpan( + public static ContextScope nameSpan( @Advice.This final Object target, @Advice.Origin final Method method, @Advice.AllArguments final Object[] args, @@ -123,7 +124,7 @@ public static AgentScope nameSpan( DECORATE.onJakartaRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); if (contextStore != null && asyncResponse != null) { contextStore.put(asyncResponse, span); @@ -134,13 +135,13 @@ public static AgentScope nameSpan( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java index 08bc75c1173..65fa0265970 100644 --- a/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/rs/jakarta-rs-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakarta3/RequestFilterHelper.java @@ -3,17 +3,18 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.JAKARTA_RS_CONTROLLER; import static datadog.trace.instrumentation.jakarta3.JakartaRsAnnotationsDecorator.JAKARTA_RS_REQUEST_ABORT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import jakarta.ws.rs.container.ContainerRequestContext; import java.lang.reflect.Method; public class RequestFilterHelper { - public static AgentScope createOrUpdateAbortSpan( + public static ContextScope createOrUpdateAbortSpan( final ContainerRequestContext context, final Class resourceClass, final Method method) { if (method != null && resourceClass != null) { @@ -29,7 +30,7 @@ public static AgentScope createOrUpdateAbortSpan( parent = activeSpan(); span = startSpan(JAKARTA_RS_CONTROLLER.toString(), JAKARTA_RS_REQUEST_ABORT); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onJakartaRsSpan(span, parent, resourceClass, method); @@ -44,12 +45,12 @@ public static AgentScope createOrUpdateAbortSpan( } } - public static void closeSpanAndScope(final AgentScope scope, final Throwable throwable) { + public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); } 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 b77279bbcf5..dc0dc598f42 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 @@ -18,7 +18,7 @@ com.codahale.metrics:metrics-logback:3.0.2=testCompileClasspath,testRuntimeClass com.codahale.metrics:metrics-servlets:3.0.2=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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -42,8 +42,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -101,8 +101,8 @@ javax.xml.stream:stax-api:1.0-2=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.3=testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -159,7 +159,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:1.9.5=testCompileClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java index 8dc6dfdead0..22f54fb0f03 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-1.1.1/src/main/java/datadog/trace/instrumentation/jaxrs1/JaxRsAnnotationsInstrumentation.java @@ -11,16 +11,17 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxrs1.JaxRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jaxrs1.JaxRsAnnotationsDecorator.JAX_RS_CONTROLLER; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.not; 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.api.InstrumenterConfig; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import java.util.Collection; @@ -89,7 +90,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JaxRsAnnotationsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope nameSpan( + public static ContextScope nameSpan( @Advice.This final Object target, @Advice.Origin final Method method) { // Rename the parent span according to the path represented by these annotations. final AgentSpan parent = activeSpan(); @@ -104,12 +105,12 @@ public static AgentScope nameSpan( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { - final AgentSpan span = scope.span(); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } 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 55d40ee7bd9..0aa2610f277 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath @@ -37,8 +37,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,nestedTestAnnotationProcessor,resteasy31TestAnnotationProcessor,testAnnotationProcessor @@ -116,8 +116,8 @@ jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.9=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.1=latestDepTestCompileClasspath,nestedTestCompileClasspath,resteasy31TestCompileClasspath,testCompileClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -215,7 +215,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,ne org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,nestedTestRuntimeClasspath,resteasy31TestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,nestedTestCompileClasspath,nestedTestRuntimeClasspath,resteasy31TestCompileClasspath,resteasy31TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java index 8dc0da68fbd..220855d932e 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/DefaultRequestContextInstrumentation.java @@ -3,13 +3,14 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.JAX_RS_CONTROLLER; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.JAX_RS_REQUEST_ABORT; import com.google.auto.service.AutoService; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.InstrumenterModule; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import javax.ws.rs.container.ContainerRequestContext; @@ -28,7 +29,8 @@ public class DefaultRequestContextInstrumentation extends AbstractRequestContextInstrumentation { public static class ContainerRequestContextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope createGenericSpan(@Advice.This final ContainerRequestContext context) { + public static ContextScope createGenericSpan( + @Advice.This final ContainerRequestContext context) { if (context.getProperty(JaxRsAnnotationsDecorator.ABORT_HANDLED) == null) { final AgentSpan parent = activeSpan(); @@ -48,7 +50,7 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo // can only be aborted inside the filter method } - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onJaxRsSpan(span, parent, filterClass, method); @@ -61,12 +63,12 @@ public static AgentScope createGenericSpan(@Advice.This final ContainerRequestCo @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); } diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java index 963637e91f8..4f7605a508e 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/JaxRsAnnotationsInstrumentation.java @@ -11,18 +11,19 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.JAX_RS_CONTROLLER; import static java.util.Collections.singletonMap; import static net.bytebuddy.matcher.ElementMatchers.isMethod; 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.api.InstrumenterConfig; 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 java.lang.reflect.Method; import java.util.Collection; @@ -99,7 +100,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class JaxRsAnnotationsAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope nameSpan( + public static ContextScope nameSpan( @Advice.This final Object target, @Advice.Origin final Method method, @Advice.AllArguments final Object[] args, @@ -130,7 +131,7 @@ public static AgentScope nameSpan( DECORATE.onJaxRsSpan(span, parent, target.getClass(), method); DECORATE.afterStart(span); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); if (contextStore != null && asyncResponse != null) { contextStore.put(asyncResponse, span); @@ -141,13 +142,13 @@ public static AgentScope nameSpan( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Local("asyncResponse") final AsyncResponse asyncResponse) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java index d99232893fe..43213c32241 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-annotations/jax-rs-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxrs2/RequestFilterHelper.java @@ -3,17 +3,18 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.DECORATE; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.JAX_RS_CONTROLLER; import static datadog.trace.instrumentation.jaxrs2.JaxRsAnnotationsDecorator.JAX_RS_REQUEST_ABORT; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import javax.ws.rs.container.ContainerRequestContext; public class RequestFilterHelper { - public static AgentScope createOrUpdateAbortSpan( + public static ContextScope createOrUpdateAbortSpan( final ContainerRequestContext context, final Class resourceClass, final Method method) { if (method != null && resourceClass != null) { @@ -28,7 +29,7 @@ public static AgentScope createOrUpdateAbortSpan( parent = activeSpan(); span = startSpan(JAX_RS_CONTROLLER.toString(), JAX_RS_REQUEST_ABORT); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); DECORATE.afterStart(span); DECORATE.onJaxRsSpan(span, parent, resourceClass, method); @@ -43,12 +44,12 @@ public static AgentScope createOrUpdateAbortSpan( } } - public static void closeSpanAndScope(final AgentScope scope, final Throwable throwable) { + public static void closeSpanAndScope(final ContextScope scope, final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { DECORATE.onError(span, throwable); } 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 b0d27be26a5..a5978b91e20 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -60,8 +60,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes javax.ws.rs:jsr311-api:1.1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java index 6f3e92f6813..6d62a70b43c 100644 --- a/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java +++ b/dd-java-agent/instrumentation/rs/jax-rs/jax-rs-client/jax-rs-client-1.1/src/main/java/datadog/trace/instrumentation/jaxrs/v1/JaxRsClientV1Instrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.currentContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE; import static datadog.trace.instrumentation.jaxrs.v1.InjectAdapter.SETTER; import static datadog.trace.instrumentation.jaxrs.v1.JaxRsClientV1Decorator.DECORATE; @@ -19,10 +20,10 @@ import com.sun.jersey.api.client.ClientHandler; import com.sun.jersey.api.client.ClientRequest; import com.sun.jersey.api.client.ClientResponse; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; -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; @@ -66,7 +67,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class HandleAdvice { @Advice.OnMethodEnter - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(value = 0) final ClientRequest request, @Advice.This final ClientHandler thisObj) { @@ -84,18 +85,18 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Return final ClientResponse response, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onResponse(span, response); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } 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 225401ffaac..f1d475701a2 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -73,8 +73,8 @@ javax.xml.bind:jaxb-api:2.2.3=latestDepTestCompileClasspath,latestDepTestRuntime javax.xml.stream:stax-api:1.0-2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -161,7 +161,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 7e39af31444..83debaf98e7 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-1.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 e06078a9221..7ad24bb6abe 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -61,8 +61,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy index ad858348316..c133e3fb77f 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy +++ b/dd-java-agent/instrumentation/rxjava/rxjava-2.0/src/test/groovy/RxJava2Test.groovy @@ -1,6 +1,6 @@ import datadog.trace.agent.test.InstrumentationSpecification import datadog.trace.api.Trace -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.reactivex.Flowable @@ -295,7 +295,7 @@ class RxJava2Test extends InstrumentationSpecification { def publisher = publisherSupplier() AgentSpan intermediate = startSpan("test", "intermediate") - AgentScope scope = activateSpan(intermediate) + ContextScope scope = activateSpan(intermediate) try { if (publisher instanceof Maybe) { return ((Maybe) publisher).map(addTwo) @@ -399,7 +399,7 @@ class RxJava2Test extends InstrumentationSpecification { @Trace(operationName = "trace-parent", resourceName = "trace-parent") def cancelUnderTrace(def publisherSupplier) { final AgentSpan span = startSpan("test", "publisher-parent") - AgentScope scope = activateSpan(span) + ContextScope scope = activateSpan(span) def publisher = publisherSupplier() if (publisher instanceof Maybe) { diff --git a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/gradle.lockfile b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/gradle.lockfile index 0560ee4dc5d..8b8c9fefbdb 100644 --- a/dd-java-agent/instrumentation/rxjava/rxjava-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/rxjava/rxjava-3.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -60,8 +60,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -102,7 +102,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 index 092156d84ee..89278800e57 100644 --- 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 @@ -15,11 +15,11 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; +import datadog.context.ContextScope; 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; @@ -83,7 +83,7 @@ static Object assemblePublisherUnderTrace(Supplier publisherSupplier) { traceParentId = activeSpan().getSpanId(); AgentSpan span = startSpan("test", "publisher-parent"); publisherParentId = span.getSpanId(); - AgentScope scope = activateSpan(span); + ContextScope scope = activateSpan(span); Object publisher = publisherSupplier.get(); try { @@ -105,7 +105,7 @@ static void cancelUnderTrace(Supplier publisherSupplier) { traceParentId = activeSpan().getSpanId(); AgentSpan span = startSpan("test", "publisher-parent"); publisherParentId = span.getSpanId(); - AgentScope scope = activateSpan(span); + ContextScope 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. @@ -500,7 +500,7 @@ void correctParentsFromSubscriptionTime(String name, int workItems, Supplier) publisher).map(Worker::addTwo); 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 index d2f76d17a9b..cc0a84b42fc 100644 --- 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 @@ -6,8 +6,8 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +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 io.reactivex.rxjava3.core.BackpressureStrategy; import io.reactivex.rxjava3.core.Completable; @@ -26,7 +26,7 @@ void maybeSubscriptionPropagatesParentSpan() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { Maybe connection = Maybe.create(emitter -> emitter.onSuccess(new Connection())); connection.subscribe( c -> { @@ -50,7 +50,7 @@ void singleSubscriptionPropagatesParentSpan() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { Single connection = Single.create(emitter -> emitter.onSuccess(new Connection())); connection.subscribe( c -> { @@ -74,7 +74,7 @@ void completableSubscriptionPropagatesParentSpan() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { Completable action = Completable.create(emitter -> emitter.onComplete()); action.subscribe( () -> { @@ -98,7 +98,7 @@ void observableSubscriptionPropagatesParentSpan() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { Observable connection = Observable.create( emitter -> { @@ -127,7 +127,7 @@ void flowableSubscriptionPropagatesParentSpan() throws InterruptedException { CountDownLatch latch = new CountDownLatch(1); AgentSpan parent = startSpan("test", "parent"); - try (AgentScope scope = activateSpan(parent)) { + try (ContextScope scope = activateSpan(parent)) { Flowable connection = Flowable.create( emitter -> { 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 99025bce600..97d0eb8e8e2 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.4=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=2_12_18RuntimeClasspath,2_13_11RuntimeClasspath,3_3_0RuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc @@ -112,7 +112,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 677b100929a..7cfe436480d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latest11TestCompileClasspath,latest11TestRunt com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest11TestAnnotationProcessor,latest12TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latest11TestRuntimeClasspath,latest12TestRuntimeClass javax.servlet:javax.servlet-api:3.1.0=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latest11TestRuntimeClasspath,lat org.junit.platform:junit-platform-suite-api:1.14.1=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latest11TestRuntimeClasspath,latest12TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latest11TestCompileClasspath,latest11TestRuntimeClasspath,latest12TestCompileClasspath,latest12TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 302e30bb0e0..837e9d0a73e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.openhft:zero-allocation-hashing:0.16=zinc @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 b9884857f7d..d63ed664c3e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.openhft:zero-allocation-hashing:0.16=zinc @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 0edd52c8bf7..6fd36dd43a4 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -112,7 +112,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 f6f996d1115..073b343bfb8 100644 --- a/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile +++ b/dd-java-agent/instrumentation/scalatest-3.0.8/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -30,8 +30,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -68,8 +68,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -123,7 +123,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 e46c473025e..27449a1916a 100644 --- a/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile +++ b/dd-java-agent/instrumentation/selenium-3.13/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -36,13 +36,15 @@ com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,lates com.google.code.gson:gson:2.14.0=spotbugs 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.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.47.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs +com.google.errorprone:error_prone_annotations:2.50.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor 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,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.6.0-jre=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.google.guava:guava:33.7.1-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 @@ -84,9 +86,9 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClas javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.13=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -137,13 +139,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.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-csp:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-cssparser:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-websocket-client:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit-xpath:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:htmlunit:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.htmlunit:neko-htmlunit:5.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-core-js:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-csp:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-cssparser:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-websocket-client:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit-xpath:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:htmlunit:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.htmlunit:neko-htmlunit:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.jacoco:org.jacoco.core:0.8.15=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jacoco:org.jacoco.report:0.8.15=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -161,7 +163,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -175,35 +176,35 @@ org.ow2.asm:asm-util:9.10.1=spotbugs org.ow2.asm:asm-util:9.7.1=latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.seleniumhq.selenium:htmlunit-driver:2.70.0=testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:htmlunit3-driver:4.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:htmlunit3-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-api:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-api:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-api:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-chrome-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-chrome-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-chromium-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-latest:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v150:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v151:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-devtools-v152:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chrome-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-chromium-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-latest:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v151:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v152:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-devtools-v153:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-edge-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-edge-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-edge-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-firefox-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-firefox-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-http:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-firefox-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-http:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-ie-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-ie-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-ie-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-java:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-java:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-json:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.seleniumhq.selenium:selenium-manager:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-java:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-json:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-manager:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-opera-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-os:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-os:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-remote-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-remote-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-remote-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-safari-driver:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-safari-driver:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-safari-driver:4.49.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.seleniumhq.selenium:selenium-support:3.141.59=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.seleniumhq.selenium:selenium-support:4.48.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.seleniumhq.selenium:selenium-support:4.49.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 2b2afca0ae8..ec953c3a7fe 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -77,8 +77,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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.10=spotbugs @@ -121,7 +121,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java index f175ada8f4b..dbf10ef5a2d 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.0/src/main/java/datadog/trace/instrumentation/servicetalk0_42_0/ContextPreservingInstrumentation.java @@ -3,10 +3,10 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; 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.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import io.servicetalk.context.api.ContextMap; @@ -53,7 +53,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class Wrapper { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.FieldValue("saved") final ContextMap contextMap) { + public static ContextScope enter(@Advice.FieldValue("saved") final ContextMap contextMap) { AgentSpan parent = InstrumentationContext.get(ContextMap.class, AgentSpan.class).get(contextMap); if (parent != null) { @@ -63,7 +63,7 @@ public static AgentScope enter(@Advice.FieldValue("saved") final ContextMap cont } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void exit(@Advice.Enter final AgentScope agentScope) { + public static void exit(@Advice.Enter final ContextScope agentScope) { if (agentScope != null) { agentScope.close(); } 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 9c0a9d88698..0772ada5c17 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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.10=spotbugs @@ -104,7 +104,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java index 6b8f2b0d9cb..b13df7f0d91 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/main/java/datadog/trace/instrumentation/servicetalk0_42_56/DatadogCapturedContextProvider.java @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.servicetalk0_42_56; -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 io.servicetalk.concurrent.api.CapturedContext; @@ -40,7 +40,7 @@ public ContextMap captured() { @Override public Scope attachContext() { Scope stScope = underlying.attachContext(); - AgentScope ddScope = AgentTracer.activateSpan(agentSpan); + ContextScope ddScope = AgentTracer.activateSpan(agentSpan); return () -> { ddScope.close(); stScope.close(); diff --git a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/test/groovy/ContextPreservingInstrumentationTest.groovy b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/test/groovy/ContextPreservingInstrumentationTest.groovy index 2d723cc3373..9de6bb6603c 100644 --- a/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/test/groovy/ContextPreservingInstrumentationTest.groovy +++ b/dd-java-agent/instrumentation/servicetalk/servicetalk-0.42.56/src/test/groovy/ContextPreservingInstrumentationTest.groovy @@ -17,7 +17,6 @@ class ContextPreservingInstrumentationTest extends InstrumentationSpecification when: runInSeparateThread { - parent.capturedContext.attachContext() try (def _ = parent.capturedContext.attachContext()) { childSpan() } 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 cd5617d06bd..c5e6512c829 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testFixturesCompileClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor @@ -57,8 +57,8 @@ jakarta.servlet:jakarta.servlet-api:5.0.0=compileClasspath,csiCompileClasspath,t javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -99,7 +99,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testFixturesRuntimeClasspath,tes org.junit.platform:junit-platform-suite-api:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/test/servlet5/AsyncRumServlet.groovy similarity index 97% rename from dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy rename to dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/test/servlet5/AsyncRumServlet.groovy index 536bc3d9b27..d97fc401f13 100644 --- a/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/datadog/trace/instrumentation/servlet5/AsyncRumServlet.groovy +++ b/dd-java-agent/instrumentation/servlet/jakarta-servlet-5.0/src/testFixtures/groovy/test/servlet5/AsyncRumServlet.groovy @@ -1,4 +1,4 @@ -package datadog.trace.instrumentation.servlet5 +package test.servlet5 import jakarta.servlet.AsyncContext import jakarta.servlet.ServletException 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 6090509e630..115f37b614a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ javax.servlet:servlet-api:2.2=compileClasspath javax.servlet:servlet-api:2.5=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -113,7 +113,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 bb515cb81b6..c37b68fcc77 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -121,7 +121,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 2fb583eaf70..770902c1a5b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,csiCompileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java index cab293136c0..e8e2d863039 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/filter/FilterInstrumentation.java @@ -5,6 +5,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.DECORATE; import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.JAVA_WEB_SERVLET_FILTER; import static datadog.trace.instrumentation.servlet.filter.FilterDecorator.SERVLET_FILTER; @@ -12,9 +13,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 javax.servlet.Filter; import net.bytebuddy.asm.Advice; @@ -63,7 +64,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class FilterAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope start(@Advice.This final Filter filter) { + public static ContextScope start(@Advice.This final Filter filter) { if (activeSpan() == null) { // Don't want to generate a new top-level span return null; @@ -80,14 +81,14 @@ public static AgentScope start(@Advice.This final Filter filter) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java index b1af9e2ea13..d35d91b0055 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletInstrumentation.java @@ -6,6 +6,7 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.servlet.SpanNameCache.SERVLET_PREFIX; import static datadog.trace.instrumentation.servlet.SpanNameCache.SPAN_NAME_CACHE; import static datadog.trace.instrumentation.servlet.http.HttpServletDecorator.DECORATE; @@ -14,9 +15,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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.lang.reflect.Method; import net.bytebuddy.asm.Advice; @@ -70,7 +71,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class HttpServletAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope start(@Advice.Origin final Method method) { + public static ContextScope start(@Advice.Origin final Method method) { if (activeSpan() == null) { // Don't want to generate a new top-level span @@ -91,14 +92,14 @@ public static AgentScope start(@Advice.Origin final Method method) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } diff --git a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java index 10e6c530212..27a1d8ef7aa 100644 --- a/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java +++ b/dd-java-agent/instrumentation/servlet/javax-servlet/javax-servlet-common/src/main/java/datadog/trace/instrumentation/servlet/http/HttpServletResponseInstrumentation.java @@ -6,15 +6,16 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.DECORATE; import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.JAVA_WEB_SERVLET_RESPONSE; import static datadog.trace.instrumentation.servlet.http.HttpServletResponseDecorator.SERVLET_RESPONSE; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.servlet.http.HttpServletResponse; import net.bytebuddy.asm.Advice; @@ -56,7 +57,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class SendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope start( + public static ContextScope start( @Advice.Origin("#m") final String method, @Advice.This final HttpServletResponse resp) { if (activeSpan() == null) { // Don't want to generate a new top-level span @@ -78,7 +79,7 @@ public static AgentScope start( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope == null) { return; } @@ -88,7 +89,7 @@ public static void stopSpan( DECORATE.onError(scope, throwable); DECORATE.beforeFinish(scope); scope.close(); - scope.span().finish(); + spanFromScope(scope).finish(); } } } 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 4962e9956a6..073ec85c1ab 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.3=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 4b746ccc0af..14e926a2b70 100644 --- a/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/slick-3.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -67,8 +67,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile index a9e34d0d39d..7fc857c9249 100644 --- a/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile +++ b/dd-java-agent/instrumentation/snakeyaml-1.33/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 8f20511223d..2b85eaa4aeb 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/gradle.lockfile @@ -23,7 +23,7 @@ com.alipay.sofa:tracer-core:3.1.10=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -54,8 +54,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=latestDepTestRuntimeClasspath,testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.9.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -169,8 +169,8 @@ javax.validation:validation-api:2.0.1.Final=compileClasspath,latestDepTestCompil javax.ws.rs:javax.ws.rs-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -233,7 +233,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java index 798de2632dd..218750a794f 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/AbstractClusterInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.sofarpc.SofaRpcClientDecorator.DECORATE; import static datadog.trace.instrumentation.sofarpc.SofaRpcClientDecorator.SOFA_RPC_CLIENT; import static datadog.trace.instrumentation.sofarpc.SofaRpcInjectAdapter.SETTER; @@ -15,8 +16,8 @@ import com.alipay.sofa.rpc.config.ConsumerConfig; import com.alipay.sofa.rpc.core.request.SofaRequest; import com.alipay.sofa.rpc.core.response.SofaResponse; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; @@ -40,7 +41,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class InvokeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter( + public static ContextScope enter( @Advice.This AbstractCluster self, @Advice.Argument(0) SofaRequest request) { ConsumerConfig config = self.getConsumerConfig(); String protocol = config != null ? config.getProtocol() : null; @@ -50,20 +51,20 @@ public static AgentScope enter( if (protocol != null) { span.setTag("sofarpc.protocol", protocol); } - AgentScope scope = activateSpan(span); + ContextScope scope = activateSpan(span); defaultPropagator().inject(span, request, SETTER); return scope; } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Return SofaResponse response, @Advice.Thrown Throwable throwable) { if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onResponse(span, response); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java index 18c0650bd3f..90adc43122e 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/main/java/datadog/trace/instrumentation/sofarpc/ProviderProxyInvokerInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentPropagation.extractContextAndGetSpanContext; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.sofarpc.SofaRpcExtractAdapter.GETTER; import static datadog.trace.instrumentation.sofarpc.SofaRpcServerDecorator.DECORATE; import static datadog.trace.instrumentation.sofarpc.SofaRpcServerDecorator.SOFA_RPC_SERVER; @@ -13,8 +14,8 @@ import com.alipay.sofa.rpc.core.request.SofaRequest; import com.alipay.sofa.rpc.core.response.SofaResponse; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import net.bytebuddy.asm.Advice; @@ -39,7 +40,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class InvokeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.Argument(0) SofaRequest request) { + public static ContextScope enter(@Advice.Argument(0) SofaRequest request) { // Protocol is set in thread-local by transport-specific instrumentation before this call. // If null, the transport is not instrumented — skip. String protocol = SofaRpcProtocolContext.get(); @@ -63,13 +64,13 @@ public static AgentScope enter(@Advice.Argument(0) SofaRequest request) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Return SofaResponse response, @Advice.Thrown Throwable throwable) { if (scope == null) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onResponse(span, response); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java index d2e37d64761..a7ed308db8e 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcRestTest.java @@ -11,8 +11,8 @@ import com.alipay.sofa.rpc.config.ConsumerConfig; import com.alipay.sofa.rpc.config.ProviderConfig; import com.alipay.sofa.rpc.config.ServerConfig; +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 datadog.trace.core.DDSpan; import java.util.ArrayList; @@ -80,7 +80,7 @@ void clientAndServerSpansForRestCall() throws InterruptedException, TimeoutExcep String serviceUniqueName = RestGreeterService.class.getName() + ":1.0"; AgentSpan callerSpan = startSpan("test", "caller"); - AgentScope callerScope = activateSpan(callerSpan); + ContextScope callerScope = activateSpan(callerSpan); String reply; try { reply = greeterService.sayHello("World"); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java index 1ce32632e97..b91900d5db6 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTest.java @@ -12,8 +12,8 @@ import com.alipay.sofa.rpc.config.ConsumerConfig; import com.alipay.sofa.rpc.config.ProviderConfig; import com.alipay.sofa.rpc.config.ServerConfig; +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 datadog.trace.core.DDSpan; import java.util.ArrayList; @@ -94,7 +94,7 @@ void clientAndServerSpansForBoltCall() throws InterruptedException, TimeoutExcep String serviceUniqueName = GreeterService.class.getName() + ":1.0"; AgentSpan callerSpan = startSpan("test", "caller"); - AgentScope callerScope = activateSpan(callerSpan); + ContextScope callerScope = activateSpan(callerSpan); String reply; try { reply = greeterService.sayHello("World"); diff --git a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java index 1645a809ab8..ec6eb153068 100644 --- a/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java +++ b/dd-java-agent/instrumentation/sofarpc/sofarpc-5.0/src/test/java/datadog/trace/instrumentation/sofarpc/SofaRpcTripleWithGrpcForkedTest.java @@ -9,8 +9,8 @@ import com.alipay.sofa.rpc.config.ConsumerConfig; import com.alipay.sofa.rpc.config.ProviderConfig; import com.alipay.sofa.rpc.config.ServerConfig; +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 datadog.trace.core.DDSpan; import java.util.ArrayList; @@ -99,7 +99,7 @@ void tearDownServer() { @Test void tripleServerSpanIsNestedUnderGrpcServer() throws InterruptedException, TimeoutException { AgentSpan callerSpan = startSpan("test", "caller"); - AgentScope callerScope = activateSpan(callerSpan); + ContextScope callerScope = activateSpan(callerSpan); String reply; try { reply = greeterService.sayHello("World"); 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 0701b2e2845..b855d0a8759 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/gradle.lockfile @@ -13,7 +13,7 @@ com.clearspring.analytics:stream:2.7.0=baseTestCompileClasspath,baseTestRuntimeC com.clearspring.analytics:stream:2.9.6=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath @@ -42,8 +42,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,baseTestAnnotationProcessor,latest212DepTestAnnotationProcessor,latest213DepTestAnnotationProcessor,testAnnotationProcessor @@ -153,8 +153,8 @@ joda-time:joda-time:2.9.9=baseTestCompileClasspath,baseTestRuntimeClasspath,comp junit:junit:3.8.1=baseTestCompileClasspath,compileClasspath junit:junit:4.13.2=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.17=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=baseTestCompileClasspath,baseTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath net.razorvine:pickle:1.3=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath @@ -371,7 +371,6 @@ org.junit.platform:junit-platform-runner:1.14.1=baseTestRuntimeClasspath,latest2 org.junit.platform:junit-platform-suite-api:1.14.1=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=baseTestCompileClasspath,baseTestRuntimeClasspath,latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.4.0=baseTestCompileClasspath,baseTestRuntimeClasspath,compileClasspath org.lz4:lz4-java:1.8.0=latest212DepTestCompileClasspath,latest212DepTestRuntimeClasspath,latest213DepTestCompileClasspath,latest213DepTestRuntimeClasspath org.mockito:mockito-core:4.4.0=baseTestRuntimeClasspath,latest212DepTestRuntimeClasspath,latest213DepTestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java index 738d86be143..b06228b9d37 100644 --- a/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java +++ b/dd-java-agent/instrumentation/spark/spark-executor-common/src/main/java/datadog/trace/instrumentation/spark/SparkExecutorInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.spark.SparkExecutorDecorator.DECORATE; import static datadog.trace.instrumentation.spark.SparkExecutorDecorator.SPARK_TASK; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; import static net.bytebuddy.matcher.ElementMatchers.isMethod; 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 net.bytebuddy.asm.Advice; import org.apache.spark.executor.Executor; @@ -52,7 +53,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class RunAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope enter(@Advice.This Executor.TaskRunner taskRunner) { + public static ContextScope enter(@Advice.This Executor.TaskRunner taskRunner) { final AgentSpan span = startSpan("spark", SPARK_TASK); DECORATE.afterStart(span); @@ -63,12 +64,12 @@ public static AgentScope enter(@Advice.This Executor.TaskRunner taskRunner) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void exit( - @Advice.Enter final AgentScope scope, @Advice.This final Executor.TaskRunner taskRunner) { + @Advice.Enter final ContextScope scope, @Advice.This final Executor.TaskRunner taskRunner) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onTaskEnd(span, taskRunner); DECORATE.beforeFinish(scope); 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 037283be9f1..2e64bc98ca0 100644 --- a/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spark/sparkjava-2.3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile index dd5f84dea8c..8c1a7fcf349 100644 --- a/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/spray-1.3/gradle.lockfile @@ -10,7 +10,7 @@ com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,comp com.chuusai:shapeless_2.11:1.2.4=compileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -75,8 +75,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -125,7 +125,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.mimepull:mimepull:1.9.4=compileClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=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 2a7b9ebd35a..a53544ed030 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 1ae65eacb29..f192ba8bba4 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 @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.6.1=latestDepForkedTestCompileClasspath,latestDepF com.blogspot.mydailyjava:weak-lock-free:0.17=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,boot1LatestDepForkedTestAnnotationProcessor,boot1LatestDepTestAnnotationProcessor,boot2ForkedTestAnnotationProcessor,boot2LatestDepForkedTestAnnotationProcessor,boot2LatestDepTestAnnotationProcessor,boot2TestAnnotationProcessor,boot3ForkedTestAnnotationProcessor,boot3TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestD javax.servlet:javax.servlet-api:3.1.0=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -107,7 +107,6 @@ org.junit.platform:junit-platform-runner:1.14.1=boot1LatestDepForkedTestRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom: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:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestRuntimeClasspath,boot3ForkedTestRuntimeClasspath,boot3TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=boot1LatestDepForkedTestCompileClasspath,boot1LatestDepForkedTestRuntimeClasspath,boot1LatestDepTestCompileClasspath,boot1LatestDepTestRuntimeClasspath,boot2ForkedTestCompileClasspath,boot2ForkedTestRuntimeClasspath,boot2LatestDepForkedTestCompileClasspath,boot2LatestDepForkedTestRuntimeClasspath,boot2LatestDepTestCompileClasspath,boot2LatestDepTestRuntimeClasspath,boot2TestCompileClasspath,boot2TestRuntimeClasspath,boot3ForkedTestCompileClasspath,boot3ForkedTestRuntimeClasspath,boot3TestCompileClasspath,boot3TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 d90762b36b5..5763bcd7fcf 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,testCompileClasspath,testRunt 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -32,8 +32,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -110,8 +110,8 @@ javax.ws.rs:jsr311-api:1.1.1=testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.1=testRuntimeClasspath net.bytebuddy:byte-buddy-agent:1.10.17=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:1.2=testCompileClasspath,testRuntimeClasspath @@ -175,7 +175,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.latencyutils:LatencyUtils:2.0.3=testRuntimeClasspath org.mockito:mockito-core:3.3.3=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:3.3.3=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 e33acbd0fcd..848d8d51e50 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 aeaf5ec1df8..f38a78bf60c 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -24,8 +24,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java index 3a94388e8a6..4461ab68576 100644 --- a/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java +++ b/dd-java-agent/instrumentation/spring/spring-data-1.8/src/main/java/datadog/trace/instrumentation/springdata/RepositoryInterceptor.java @@ -5,7 +5,7 @@ import static datadog.trace.instrumentation.springdata.SpringDataDecorator.DECORATOR; import static datadog.trace.instrumentation.springdata.SpringDataDecorator.REPOSITORY_OPERATION; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.lang.reflect.Method; import org.aopalliance.intercept.MethodInterceptor; @@ -35,7 +35,7 @@ public Object invoke(final MethodInvocation methodInvocation) throws Throwable { DECORATOR.afterStart(span); DECORATOR.onOperation(span, invokedMethod, repositoryInterface); - final AgentScope scope = activateSpan(span); + final ContextScope scope = activateSpan(span); Object result = null; try { 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 d4caf38e16e..1efb5c46f8c 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -23,8 +23,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -59,8 +59,8 @@ javax.jms:jms-api:1.1-rev-1=compileClasspath,latestDepForkedTestCompileClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 466d0eb51e3..77fe436c759 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 @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestIm com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -36,8 +36,8 @@ 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.10.3=compileClasspath,compileOnlyDependenciesMetadata,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileOnlyDependenciesMetadata,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -110,8 +110,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTes jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.12=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,implementationDependenciesMetadata,latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -204,7 +204,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestImplementationDependenciesMetadata,latestDepTestRuntimeClasspath,testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java index 69e8d73408e..a42e4bfdfd6 100644 --- a/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-messaging-4.0/src/main/java/datadog/trace/instrumentation/springmessaging/SpringMessageHandlerInstrumentation.java @@ -7,6 +7,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activeSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.rootContext; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.COMPONENT_NAME; import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.DECORATE; import static datadog.trace.instrumentation.springmessaging.SpringMessageDecorator.SPRING_INBOUND; @@ -19,7 +20,6 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.agent.tooling.annotation.AppliesOn; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import net.bytebuddy.asm.Advice; @@ -80,7 +80,7 @@ public static void onExit(@Advice.Local("ctxScope") ContextScope scope) { public static class HandleMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter(@Advice.This InvocableHandlerMethod thiz) { + public static ContextScope onEnter(@Advice.This InvocableHandlerMethod thiz) { AgentSpan span = startSpan(COMPONENT_NAME.toString(), SPRING_INBOUND); DECORATE.afterStart(span); span.setResourceName(DECORATE.spanNameForMethod(thiz.getMethod())); @@ -89,13 +89,13 @@ public static AgentScope onEnter(@Advice.This InvocableHandlerMethod thiz) { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Return(readOnly = false) Object result, @Advice.Thrown Throwable error) { if (null == scope) { return; } - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); scope.close(); if (null != error) { DECORATE.onError(span, error); 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 6482e10a6cb..a8c259f5b5f 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -29,8 +29,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -69,8 +69,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,la javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java index 6a9fa4bec55..42c3f674506 100644 --- a/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-rabbit-1.5/src/main/java/datadog/trace/instrumentation/springamqp/AbstractMessageListenerContainerInstrumentation.java @@ -3,6 +3,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter.ExcludeType.RUNNABLE; import static datadog.trace.instrumentation.springamqp.RabbitListenerDecorator.AMQP_CONSUME; import static datadog.trace.instrumentation.springamqp.RabbitListenerDecorator.DECORATE; @@ -17,7 +18,6 @@ import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.java.concurrent.ExcludeFilter; import datadog.trace.bootstrap.instrumentation.java.concurrent.State; @@ -66,7 +66,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ActivateContinuation { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope activate(@Advice.Argument(1) Object data) { + public static ContextScope activate(@Advice.Argument(1) Object data) { if (data instanceof Message) { Message message = (Message) data; State state = InstrumentationContext.get(Message.class, State.class).get(message); @@ -87,9 +87,9 @@ public static AgentScope activate(@Advice.Argument(1) Object data) { } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void close(@Advice.Enter AgentScope scope, @Advice.Thrown Throwable error) { + public static void close(@Advice.Enter ContextScope scope, @Advice.Thrown Throwable error) { if (null != scope) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } 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 f8b09446ca3..e4020a193b7 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 @@ -3,110 +3,110 @@ # 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 +cafe.cryptography:curve25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.2.13=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-classic:1.4.5=spring6TestCompileClasspath,spring6TestRuntimeClasspath -ch.qos.logback:logback-classic:1.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +ch.qos.logback:logback-classic:1.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath ch.qos.logback:logback-core:1.2.13=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath ch.qos.logback:logback-core:1.4.5=spring6TestCompileClasspath,spring6TestRuntimeClasspath -ch.qos.logback:logback-core:1.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-annotations:2.11.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.11.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.11.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.fasterxml:classmate:1.5.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +ch.qos.logback:logback-core:1.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-annotations:2.11.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.11.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.11.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.11.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.fasterxml:classmate:1.5.1=latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.15=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jffi:1.3.15=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 -com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestAnnotationProcessor,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,spring6TestAnnotationProcessor,spring6TestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestAnnotationProcessor,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath com.google.code.gson:gson:2.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor -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: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.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=annotationProcessor,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestAnnotationProcessor,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestAnnotationProcessor,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.re2j:re2j:1.8=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 -com.squareup.moshi:moshi:1.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okhttp3:okhttp:3.12.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.squareup.okio:okio:1.17.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.h2database:h2:2.5.250=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.sun.activation:jakarta.activation:2.0.1=spring6TestRuntimeClasspath com.sun.istack:istack-commons-runtime:3.0.7=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.sun.istack:istack-commons-runtime:4.0.1=spring6TestRuntimeClasspath -com.sun.istack:istack-commons-runtime:4.1.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +com.sun.istack:istack-commons-runtime:4.1.1=latestDepTestRuntimeClasspath com.sun.xml.fastinfoset:FastInfoset:1.2.15=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc com.zaxxer:HikariCP:3.4.5=testCompileClasspath,testRuntimeClasspath com.zaxxer:HikariCP:4.0.3=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath com.zaxxer:HikariCP:5.0.1=spring6TestCompileClasspath,spring6TestRuntimeClasspath -com.zaxxer:HikariCP:6.3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -commons-fileupload:commons-fileupload:1.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.zaxxer:HikariCP:6.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -io.micrometer:micrometer-commons:1.15.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.micrometer:micrometer-core:1.6.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -io.micrometer:micrometer-observation:1.15.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.smallrye:jandex:3.2.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:2.1.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +io.micrometer:micrometer-commons:1.15.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.micrometer:micrometer-core:1.6.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.micrometer:micrometer-observation:1.15.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.smallrye:jandex:3.2.0=latestDepTestRuntimeClasspath +io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +jakarta.activation:jakarta.activation-api:2.1.1=latestDepTestRuntimeClasspath jakarta.annotation:jakarta.annotation-api:1.3.5=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:2.1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath jakarta.inject:jakarta.inject-api:2.0.0=spring6TestRuntimeClasspath -jakarta.inject:jakarta.inject-api:2.0.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +jakarta.inject:jakarta.inject-api:2.0.1=latestDepTestRuntimeClasspath jakarta.persistence:jakarta.persistence-api:2.2.3=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.persistence:jakarta.persistence-api:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -jakarta.persistence:jakarta.persistence-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +jakarta.persistence:jakarta.persistence-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.transaction:jakarta.transaction-api:1.3.3=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jakarta.transaction:jakarta.transaction-api:2.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -jakarta.transaction:jakarta.transaction-api:2.0.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +jakarta.transaction:jakarta.transaction-api:2.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=spring6TestRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:4.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:4.0.0=latestDepTestRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -net.java.dev.jna:jna:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -net.javacrumbs.shedlock:shedlock-core:4.21.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +net.javacrumbs.shedlock:shedlock-core:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.javacrumbs.shedlock:shedlock-core:4.48.0=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath -net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.21.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.javacrumbs.shedlock:shedlock-provider-jdbc-template:4.48.0=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath -net.javacrumbs.shedlock:shedlock-spring:4.21.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +net.javacrumbs.shedlock:shedlock-spring:4.21.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.javacrumbs.shedlock:shedlock-spring:4.48.0=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs org.antlr:antlr4-runtime:4.10.1=spring6TestRuntimeClasspath -org.antlr:antlr4-runtime:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.antlr:antlr4-runtime:4.13.2=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.12.0=spotbugs @@ -115,189 +115,188 @@ org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.13.3=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-api:2.17.2=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.19.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.24.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.24.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apache.logging.log4j:log4j-to-slf4j:2.13.3=testCompileClasspath,testRuntimeClasspath org.apache.logging.log4j:log4j-to-slf4j:2.17.2=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.apache.logging.log4j:log4j-to-slf4j:2.19.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.apache.logging.log4j:log4j-to-slf4j:2.24.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,latestSpring5TestCompileClasspath,spring6TestCompileClasspath,testCompileClasspath -org.aspectj:aspectjweaver:1.9.22.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.24.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,latestSpring5TestCompileClasspath,spring6TestCompileClasspath,testCompileClasspath +org.aspectj:aspectjweaver:1.9.22.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.aspectj:aspectjweaver:1.9.6=testCompileClasspath,testRuntimeClasspath org.aspectj:aspectjweaver:1.9.7=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.aspectj:aspectjweaver:1.9.9.1=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,testAnnotationProcessor +org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepTestAnnotationProcessor,latestSpring5TestAnnotationProcessor,spring6TestAnnotationProcessor,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,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,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,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.groovy:groovy:3.0.25=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.1.3=testCompileClasspath,testRuntimeClasspath org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.angus:angus-activation:2.0.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.eclipse.angus:angus-activation:2.0.0=latestDepTestRuntimeClasspath org.glassfish.jaxb:jaxb-core:3.0.2=spring6TestRuntimeClasspath -org.glassfish.jaxb:jaxb-core:4.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.glassfish.jaxb:jaxb-core:4.0.2=latestDepTestRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:2.3.1=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:jaxb-runtime:3.0.2=spring6TestRuntimeClasspath -org.glassfish.jaxb:jaxb-runtime:4.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:4.0.2=latestDepTestRuntimeClasspath org.glassfish.jaxb:txw2:2.3.1=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.glassfish.jaxb:txw2:3.0.2=spring6TestRuntimeClasspath -org.glassfish.jaxb:txw2:4.0.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.glassfish.jaxb:txw2:4.0.2=latestDepTestRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hdrhistogram:HdrHistogram:2.1.12=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hdrhistogram:HdrHistogram:2.1.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:5.1.2.Final=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hibernate.common:hibernate-commons-annotations:6.0.2.Final=spring6TestRuntimeClasspath -org.hibernate.common:hibernate-commons-annotations:7.0.3.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.hibernate.common:hibernate-commons-annotations:7.0.3.Final=latestDepTestRuntimeClasspath org.hibernate.orm:hibernate-core:6.1.5.Final=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.hibernate.orm:hibernate-core:6.6.53.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.hibernate.orm:hibernate-core:6.6.53.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.hibernate:hibernate-core:5.4.23.Final=testCompileClasspath,testRuntimeClasspath org.hibernate:hibernate-core:5.6.15.Final=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.javassist:javassist:3.24.0-GA=testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.4.1.Final=testCompileClasspath,testRuntimeClasspath org.jboss.logging:jboss-logging:3.4.3.Final=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath -org.jboss.logging:jboss-logging:3.5.0.Final=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +org.jboss.logging:jboss-logging:3.5.0.Final=latestDepTestRuntimeClasspath 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 -org.junit.jupiter:junit-jupiter:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs +org.jctools:jctools-core-jdk11:4.0.6=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.jctools:jctools-core:4.0.6=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.jspecify:jspecify:1.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.jvnet.staxex:stax-ex:1.8=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.latencyutils:LatencyUtils:2.0.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.latencyutils:LatencyUtils:2.0.3=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.objenesis:objenesis:3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spotbugs,spring6TestRuntimeClasspath,testRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.36=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath -org.slf4j:jul-to-slf4j:2.0.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:jul-to-slf4j:2.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:jul-to-slf4j:2.0.4=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,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:1.7.36=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j -org.slf4j:slf4j-api:2.0.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +org.slf4j:slf4j-api:2.0.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs org.slf4j:slf4j-api:2.0.4=spring6TestCompileClasspath,spring6TestRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-actuator-autoconfigure:2.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-actuator:2.4.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepTestRuntimeClasspath,latestSpring5TestRuntimeClasspath,muzzleTooling,runtimeClasspath,spring6TestRuntimeClasspath,testRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-actuator-autoconfigure:2.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework.boot:spring-boot-actuator:2.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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.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-autoconfigure:3.5.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-actuator:2.4.0=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 org.springframework.boot:spring-boot-starter-aop:3.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath 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.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-data-jpa:3.5.16=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.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-jdbc:3.5.16=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.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:3.5.16=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.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:3.5.16=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.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:3.5.16=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.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.data:spring-data-commons:3.5.13=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.13=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.data:spring-data-jpa:3.5.13=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 org.springframework:spring-aop:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-aop:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aspects:5.3.1=testCompileClasspath,testRuntimeClasspath org.springframework:spring-aspects:5.3.31=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-aspects:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-aspects:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aspects:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-beans:5.0.0.RELEASE=compileClasspath org.springframework:spring-beans:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-beans:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-beans:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-beans:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context:5.0.0.RELEASE=compileClasspath org.springframework:spring-context:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-context:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-context:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-context:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:5.0.0.RELEASE=compileClasspath org.springframework:spring-core:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-core:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-core:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-core:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:5.0.0.RELEASE=compileClasspath org.springframework:spring-expression:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-expression:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-expression:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-expression:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jcl:5.0.0.RELEASE=compileClasspath org.springframework:spring-jcl:5.3.39=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-jcl:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jcl:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-jcl:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-jdbc:5.3.31=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-jdbc:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-jdbc:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-jdbc:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jdbc:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-orm:5.3.1=testCompileClasspath,testRuntimeClasspath org.springframework:spring-orm:5.3.31=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-orm:6.0.0=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-orm:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-orm:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-tx:5.3.31=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.springframework:spring-tx:5.3.4=testCompileClasspath,testRuntimeClasspath org.springframework:spring-tx:6.0.2=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.springframework:spring-tx:6.2.19=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.tabletest:tabletest-junit:1.2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-tx:6.2.19=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath,spring6TestCompileClasspath,spring6TestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs org.yaml:snakeyaml:1.27=testCompileClasspath,testRuntimeClasspath org.yaml:snakeyaml:1.30=latestSpring5TestCompileClasspath,latestSpring5TestRuntimeClasspath org.yaml:snakeyaml:1.33=spring6TestCompileClasspath,spring6TestRuntimeClasspath -org.yaml:snakeyaml:2.4=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.yaml:snakeyaml:2.4=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath empty=spotbugsPlugins 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 3ce2fc586ad..cb14fe24340 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -36,8 +36,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -75,8 +75,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -131,7 +131,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.0.0=testCompileClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.mockito:mockito-core:4.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath 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 fe78d6afef1..c3c8043bd9c 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.5.34=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -38,8 +38,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -83,8 +83,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.minidev:accessors-smart:2.4.7=testCompileClasspath,testRuntimeClasspath @@ -142,7 +142,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.8.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.17.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.8.1=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 cd9a707db3c..8284d02e6a1 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=iastTestCompileClasspath,iastTestRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath @@ -44,8 +44,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,iastTestAnnotationProcessor,latestBoot20TestAnnotationProcessor,latestBoot24TestAnnotationProcessor,latestBoot2LatestTestAnnotationProcessor,latestDepTestAnnotationProcessor,latestIast24TestAnnotationProcessor,latestIast3TestAnnotationProcessor,latestIastTestAnnotationProcessor,testAnnotationProcessor @@ -154,8 +154,8 @@ javax.validation:validation-api:2.0.1.Final=iastTestCompileClasspath,iastTestRun jaxen:jaxen:2.0.6=spotbugs junit:junit:4.12=iastTestCompileClasspath,latestBoot20TestCompileClasspath,latestIast3TestCompileClasspath junit:junit:4.13.2=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:1.2=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath @@ -212,7 +212,6 @@ org.junit.platform:junit-platform-runner:1.14.1=iastTestRuntimeClasspath,latestB org.junit.platform:junit-platform-suite-api:1.14.1=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,latestIastTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=iastTestCompileClasspath,iastTestRuntimeClasspath,latestBoot20TestCompileClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestCompileClasspath,latestBoot24TestRuntimeClasspath,latestBoot2LatestTestCompileClasspath,latestBoot2LatestTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,latestIast24TestCompileClasspath,latestIast24TestRuntimeClasspath,latestIast3TestCompileClasspath,latestIast3TestRuntimeClasspath,latestIastTestCompileClasspath,latestIastTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:2.15.0=iastTestCompileClasspath,latestBoot20TestCompileClasspath,latestIast3TestCompileClasspath org.mockito:mockito-core:3.6.28=latestBoot24TestCompileClasspath,latestIast24TestCompileClasspath org.mockito:mockito-core:4.4.0=iastTestRuntimeClasspath,latestBoot20TestRuntimeClasspath,latestBoot24TestRuntimeClasspath,latestDepTestRuntimeClasspath,latestIast24TestRuntimeClasspath,latestIast3TestRuntimeClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java index 2f5cdcbeae8..3ee18dd164e 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/DispatcherHandlerAdvice.java @@ -3,11 +3,12 @@ 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 datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DECORATE; import static datadog.trace.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DISPATCHER_HANDLE_HANDLER; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.reactivestreams.HandoffContext; import java.util.function.Consumer; @@ -23,7 +24,7 @@ public class DispatcherHandlerAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter(@Advice.Argument(0) final ServerWebExchange exchange) { + public static ContextScope methodEnter(@Advice.Argument(0) final ServerWebExchange exchange) { // Unfortunately Netty EventLoop is not instrumented well enough to attribute all work to the // right things so we have to store span in request itself. We also store parent (netty's) // span @@ -43,12 +44,12 @@ public static AgentScope methodEnter(@Advice.Argument(0) final ServerWebExchange @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Argument(0) final ServerWebExchange exchange, @Advice.Return(readOnly = false) Mono mono) { if (throwable == null && mono != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); final Consumer finisher = new AdviceUtils.MonoSpanFinisher(span); mono = mono.doOnError(finisher).doFinally(finisher); InstrumentationContext.get(Publisher.class, HandoffContext.class) diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java index 326ddce3ff4..c6a7cc1e3ea 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/HandlerAdapterAdvice.java @@ -1,12 +1,13 @@ package datadog.trace.instrumentation.springwebflux.server; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR; import static datadog.trace.instrumentation.springwebflux.server.AdviceUtils.constructOperationName; import static datadog.trace.instrumentation.springwebflux.server.SpringWebfluxHttpServerDecorator.DECORATE; +import datadog.context.ContextScope; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.reactivestreams.HandoffContext; import net.bytebuddy.asm.Advice; @@ -22,11 +23,11 @@ public class HandlerAdapterAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.Argument(0) final ServerWebExchange exchange, @Advice.Argument(1) final Object handler) { - AgentScope scope = null; + ContextScope scope = null; final AgentSpan span = exchange.getAttribute(AdviceUtils.SPAN_ATTRIBUTE); if (handler != null && span != null) { final String handlerType; @@ -66,14 +67,14 @@ public static AgentScope methodEnter( public static void methodExit( @Advice.Return(readOnly = false) Mono mono, @Advice.Argument(0) final ServerWebExchange exchange, - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { if (scope != null) { if (throwable != null) { DECORATE.onError(scope, throwable); } else if (mono != null) { InstrumentationContext.get(Publisher.class, HandoffContext.class) - .put(mono, HandoffContext.anyThread(scope.span())); + .put(mono, HandoffContext.anyThread(spanFromScope(scope))); } scope.close(); // span finished in SpanFinishingSubscriber diff --git a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java index 25af2c3d295..09b0627eb1a 100644 --- a/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java +++ b/dd-java-agent/instrumentation/spring/spring-webflux/spring-webflux-5.0/src/main/java/datadog/trace/instrumentation/springwebflux/server/RouteOnSuccessOrError.java @@ -31,11 +31,11 @@ public class RouteOnSuccessOrError implements Consumer> { .trim()) .replaceAll(""); + private static final DDCache PARSED_ROUTE_CACHE = DDCaches.newFixedSizeCache(64); + private final RouterFunction routerFunction; private final ServerRequest serverRequest; - private final DDCache parsedRouteCache = DDCaches.newFixedSizeCache(16); - public RouteOnSuccessOrError( final RouterFunction routerFunction, final ServerRequest serverRequest) { this.routerFunction = routerFunction; @@ -56,7 +56,7 @@ private String parsePredicateString() { @Nonnull private String parseRoute(@Nonnull String routerString) { - return parsedRouteCache.computeIfAbsent(routerString, PATH_EXTRACTOR); + return PARSED_ROUTE_CACHE.computeIfAbsent(routerString, PATH_EXTRACTOR); } @Override 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 9796635f20a..d2e2bcf22ae 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 @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.5.34=latestDepBootTestCompileClasspath,latestDepBo com.blogspot.mydailyjava:weak-lock-free:0.17=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,bootTestAnnotationProcessor,iastTestAnnotationProcessor,latestDepBootTestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -135,8 +135,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=latestDepBootTestCompileClasspath,la javax.servlet:javax.servlet-api:3.1.0=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=bootTestCompileClasspath,bootTestRuntimeClasspath,buildTimeInstrumentationPlugin,compileClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.7=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath @@ -189,7 +189,6 @@ org.junit.platform:junit-platform-runner:1.14.1=bootTestRuntimeClasspath,iastTes org.junit.platform:junit-platform-suite-api:1.14.1=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=bootTestRuntimeClasspath,iastTestRuntimeClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath,latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.8.1=bootTestCompileClasspath,bootTestRuntimeClasspath,iastTestCompileClasspath,iastTestRuntimeClasspath org.mockito:mockito-core:5.17.0=latestDepBootTestCompileClasspath,latestDepBootTestRuntimeClasspath 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 e51cab6cf0e..7959fe37d18 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 @@ -3,262 +3,261 @@ # 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 -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,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 -com.fasterxml.jackson.core:jackson-annotations:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,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 +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.5=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-annotations:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.8.0=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.8.10=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.8.11.2=testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.13.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml:classmate:1.3.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jdk8:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.module:jackson-module-parameter-names:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.13.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml:classmate:1.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +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.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +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.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -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: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.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: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.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 -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.sun.istack:istack-commons-runtime:3.0.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.bind:jaxb-impl:2.2.5-2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.sun.xml.fastinfoset:FastInfoset:1.2.16=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.jayway.jsonpath:json-path:2.7.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,testRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.istack:istack-commons-runtime:3.0.8=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.xml.bind:jaxb-impl:2.2.5-2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.sun.xml.fastinfoset:FastInfoset:1.2.16=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc -com.vaadin.external.google:android-json:0.0.20131108.vaadin1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.14=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.vaadin.external.google:android-json:0.0.20131108.vaadin1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.14=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-codec:commons-codec:1.9=testCompileClasspath,testRuntimeClasspath -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=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -commons-logging:commons-logging:1.1.1=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-logging:commons-logging:1.1.1=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-logging:commons-logging:1.2=testCompileClasspath,testRuntimeClasspath -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.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath jakarta.activation:jakarta.activation-api:1.2.1=testCompileClasspath,testRuntimeClasspath -jakarta.activation:jakarta.activation-api:1.2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +jakarta.activation:jakarta.activation-api:1.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jakarta.xml.bind:jakarta.xml.bind-api:2.3.2=testCompileClasspath,testRuntimeClasspath -jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -javassist:javassist:3.12.1.GA=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.activation:activation:1.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.annotation:jsr250-api:1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -javax.validation:validation-api:1.1.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +javassist:javassist:3.12.1.GA=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.activation:activation:1.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.annotation:jsr250-api:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +javax.validation:validation-api:1.1.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.12=testCompileClasspath -junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 -net.jcip:jcip-annotations:1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.jcip:jcip-annotations:1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.minidev:accessors-smart:1.1=testCompileClasspath,testRuntimeClasspath -net.minidev:accessors-smart:2.4.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.minidev:accessors-smart:2.4.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.minidev:json-smart:2.2.1=testCompileClasspath,testRuntimeClasspath -net.minidev:json-smart:2.4.7=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +net.minidev:json-smart:2.4.7=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc org.apache.bcel:bcel:6.12.0=spotbugs org.apache.commons:commons-lang3:3.20.0=spotbugs org.apache.commons:commons-text:1.15.0=spotbugs -org.apache.httpcomponents:httpclient:4.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.httpcomponents:httpcore:4.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.apache.logging.log4j:log4j-api:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.httpcomponents:httpclient:4.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.logging.log4j:log4j-api:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apache.logging.log4j:log4j-to-slf4j:2.17.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.logging.log4j:log4j-to-slf4j:2.17.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-core:8.5.34=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.83=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.83=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-el:8.5.34=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-el:9.0.83=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-el:9.0.83=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat.embed:tomcat-embed-websocket:8.5.34=testCompileClasspath,testRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:9.0.83=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.apache.tomcat:tomcat-annotations-api:8.5.34=testCompileClasspath,testRuntimeClasspath -org.apiguardian:apiguardian-api:1.1.2=latestDepForkedTestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath +org.apiguardian:apiguardian-api:1.1.2=latestDepTestCompileClasspath,testCompileClasspath org.assertj:assertj-core:2.6.0=testCompileClasspath,testRuntimeClasspath -org.assertj:assertj-core:3.22.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +org.assertj:assertj-core:3.22.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 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=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=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-core-asl:1.9.13=testCompileClasspath,testRuntimeClasspath org.codehaus.jackson:jackson-mapper-asl:1.9.13=testCompileClasspath,testRuntimeClasspath -org.codehaus.jettison:jettison:1.3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.jettison:jettison:1.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.glassfish.jaxb:jaxb-runtime:2.3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.glassfish.jaxb:txw2:2.3.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:jaxb-runtime:2.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:txw2:2.3.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.hamcrest:hamcrest-library:1.3=testCompileClasspath,testRuntimeClasspath -org.hamcrest:hamcrest:3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.hibernate:hibernate-validator:5.4.2.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.logging:jboss-logging:3.3.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:jaxrs-api:3.0.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-jaxb-provider:3.0.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.jboss.resteasy:resteasy-jettison-provider:3.0.0.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -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 -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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -org.jvnet.staxex:stax-ex:1.8.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hamcrest:hamcrest:3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.hibernate:hibernate-validator:5.4.2.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.logging:jboss-logging:3.3.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:jaxrs-api:3.0.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-jaxb-provider:3.0.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-jaxrs:3.0.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-jettison-provider:3.0.0.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jboss.resteasy:resteasy-spring:3.0.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 +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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jvnet.staxex:stax-ex:1.8.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:1.10.19=testCompileClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath -org.mockito:mockito-core:4.5.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.mockito:mockito-junit-jupiter:4.5.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mockito:mockito-core:4.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.mockito:mockito-junit-jupiter:4.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +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.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath -org.scannotation:scannotation:1.0.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath +org.scannotation:scannotation:1.0.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.skyscreamer:jsonassert:1.4.0=testCompileClasspath,testRuntimeClasspath -org.skyscreamer:jsonassert:1.5.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.skyscreamer:jsonassert:1.5.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:jul-to-slf4j:1.7.30=testCompileClasspath,testRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.36=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.36=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +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=testCompileClasspath,testRuntimeClasspath -org.slf4j:slf4j-api:1.7.36=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.slf4j:slf4j-api:1.7.36=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs -org.slf4j:slf4j-simple:1.5.8=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +org.slf4j:slf4j-simple:1.5.8=latestDepTestRuntimeClasspath,testRuntimeClasspath org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,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.spockframework:spock-spring:2.4-groovy-3.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +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.spockframework:spock-spring:2.4-groovy-3.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.springframework.boot:spring-boot-autoconfigure:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-autoconfigure:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework.boot:spring-boot-starter-json:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-autoconfigure:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-json:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-logging:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-logging:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-logging:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-security:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-security:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-security:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-test:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-test:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-test:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-tomcat:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-tomcat:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-tomcat:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-web:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-web:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-web:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter-websocket:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter-websocket:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter-websocket:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-starter:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-starter:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-starter:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test-autoconfigure:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test-autoconfigure:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test-autoconfigure:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot-test:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot-test:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot-test:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.boot:spring-boot:1.5.17.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.boot:spring-boot:2.7.18=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.boot:spring-boot:2.7.18=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security.oauth:spring-security-oauth2:2.0.16.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security.oauth:spring-security-oauth2:2.5.2.RELEASE=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-config:4.2.9.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-config:5.7.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-config:5.7.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-core:4.2.9.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-core:5.7.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework.security:spring-security-crypto:5.7.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-core:5.7.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-crypto:5.7.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework.security:spring-security-web:4.2.9.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework.security:spring-security-web:5.7.11=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework.security:spring-security-web:5.7.11=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-aop:3.1.0.RELEASE=compileClasspath org.springframework:spring-aop:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-aop:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-aop:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-asm:3.1.0.RELEASE=compileClasspath org.springframework:spring-beans:3.1.0.RELEASE=compileClasspath org.springframework:spring-beans:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-beans:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-beans:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-context-support:3.1.0.RELEASE=compileClasspath org.springframework:spring-context:3.1.0.RELEASE=compileClasspath org.springframework:spring-context:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-context:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-context:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-core:3.1.0.RELEASE=compileClasspath org.springframework:spring-core:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-core:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-core:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-expression:3.1.0.RELEASE=compileClasspath org.springframework:spring-expression:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-expression:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.springframework:spring-jcl:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-expression:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-jcl:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-messaging:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-messaging:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-messaging:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-test:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-test:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-test:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-web:3.1.0.RELEASE=compileClasspath org.springframework:spring-web:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-web:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-web:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-webmvc:3.1.0.RELEASE=compileClasspath org.springframework:spring-webmvc:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-webmvc:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.springframework:spring-webmvc:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.springframework:spring-websocket:4.3.20.RELEASE=testCompileClasspath,testRuntimeClasspath -org.springframework:spring-websocket:5.3.31=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.tabletest:tabletest-junit:1.2.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.springframework:spring-websocket:5.3.31=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs -org.xmlunit:xmlunit-core:2.9.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.xmlunit:xmlunit-core:2.9.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.yaml:snakeyaml:1.17=testRuntimeClasspath -org.yaml:snakeyaml:1.30=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.yaml:snakeyaml:1.30=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath empty=spotbugsPlugins diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java index 3e4bd33e594..216f748fa8e 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/HandlerAdapterInstrumentation.java @@ -8,9 +8,8 @@ import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.rootContext; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE; -import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_CONTINUE_SUFFIX; -import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_PREFIX_KEY; import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.handlerSpanKeys; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -21,6 +20,7 @@ import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.servlet.http.HttpServletRequest; import net.bytebuddy.asm.Advice; @@ -70,8 +70,7 @@ public static class ControllerAdvice { public static ContextScope nameResourceAndStartSpan( @Advice.Argument(0) final HttpServletRequest request, @Advice.Argument(2) final Object handler, - @Advice.Local("handlerSpanKey") String handlerSpanKey) { - handlerSpanKey = ""; + @Advice.Local("handlerSpanKeys") Pair handlerSpanKeys) { // Name the parent span based on the matching pattern Object contextObj = request.getAttribute(DD_CONTEXT_ATTRIBUTE); @@ -89,16 +88,16 @@ public static ContextScope nameResourceAndStartSpan( // Now create a span for handler/controller execution. - final String handlerKey; + final Class handlerClass; if (handler instanceof HandlerMethod) { - handlerKey = ((HandlerMethod) handler).getBean().getClass().getName(); + handlerClass = ((HandlerMethod) handler).getBean().getClass(); } else { - handlerKey = handler.getClass().getName(); + handlerClass = handler.getClass(); } - handlerSpanKey = DD_HANDLER_SPAN_PREFIX_KEY + handlerKey; + handlerSpanKeys = handlerSpanKeys(handlerClass); // If the context already exists, return it - final Object existingContext = request.getAttribute(handlerSpanKey); + final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft()); if (existingContext instanceof Context) { return ((Context) existingContext).attach(); } @@ -108,7 +107,7 @@ public static ContextScope nameResourceAndStartSpan( DECORATE.afterStart(span); DECORATE.onHandle(span, handler); - request.setAttribute(handlerSpanKey, span); + request.setAttribute(handlerSpanKeys.getLeft(), span); return span.attachWithContext(); } @@ -117,13 +116,11 @@ public static void stopSpan( @Advice.Argument(0) final HttpServletRequest request, @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, - @Advice.Local("handlerSpanKey") String handlerSpanKey) { + @Advice.Local("handlerSpanKeys") Pair handlerSpanKeys) { if (scope == null) { return; } - boolean finish = - !Boolean.TRUE.equals( - request.getAttribute(handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX)); + boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight())); final AgentSpan span = spanFromContext(scope.context()); scope.close(); if (throwable != null) { diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java index a4b26041f02..989f4841be5 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/InvocableHandlerMethodInstrumentation.java @@ -1,12 +1,12 @@ package datadog.trace.instrumentation.springweb; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; -import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_CONTINUE_SUFFIX; -import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_PREFIX_KEY; +import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.handlerSpanKeys; import com.google.auto.service.AutoService; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import java.util.concurrent.CompletionStage; @@ -53,21 +53,22 @@ public static void after( return; } ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest; - final String handlerSpanKey = - DD_HANDLER_SPAN_PREFIX_KEY + self.getBean().getClass().getName(); + final Pair handlerSpanKeys = handlerSpanKeys(self.getBean().getClass()); if (Boolean.TRUE.equals( servletWebRequest.getAttribute( - handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX, ServletWebRequest.SCOPE_REQUEST))) { + handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) { return; } - Object span = servletWebRequest.getAttribute(handlerSpanKey, ServletWebRequest.SCOPE_REQUEST); + Object span = + servletWebRequest.getAttribute( + handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST); if (!(span instanceof AgentSpan)) { return; } servletWebRequest.setAttribute( - handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX, true, ServletWebRequest.SCOPE_REQUEST); + handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST); result = ((CompletionStage) result) .whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span)); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java index 473b7b2b050..b7a2778d097 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/main/java/datadog/trace/instrumentation/springweb/SpringWebHttpServerDecorator.java @@ -1,8 +1,11 @@ package datadog.trace.instrumentation.springweb; +import static datadog.trace.api.Pair.of; import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR; import datadog.context.Context; +import datadog.trace.api.GenericClassValue; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter; @@ -33,6 +36,18 @@ public class SpringWebHttpServerDecorator public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span."; public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue"; + private static final ClassValue> HANDLER_SPAN_KEYS = + GenericClassValue.of( + type -> { + String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName(); + return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX); + }); + + /** Returns the span attribute key on the left and the continuation attribute key on the right. */ + public static Pair handlerSpanKeys(Class handlerClass) { + return HANDLER_SPAN_KEYS.get(handlerClass); + } + public SpringWebHttpServerDecorator(CharSequence component) { this.component = component; } diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java new file mode 100644 index 00000000000..56a97dd727a --- /dev/null +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-3.1/src/test/java/datadog/trace/instrumentation/springweb/HandlerSpanKeysTest.java @@ -0,0 +1,40 @@ +package datadog.trace.instrumentation.springweb; + +import static datadog.trace.instrumentation.springweb.SpringWebHttpServerDecorator.handlerSpanKeys; +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.api.Pair; +import org.junit.jupiter.api.Test; + +class HandlerSpanKeysTest { + @Test + void reusesKeysForTheSameControllerClass() { + Pair first = handlerSpanKeys(Controller.class); + Pair second = handlerSpanKeys(Controller.class); + + assertSame(first, second); + assertSame(first.getLeft(), second.getLeft()); + assertSame(first.getRight(), second.getRight()); + assertEquals( + "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$Controller", + first.getLeft()); + assertEquals(first.getLeft() + ".continue", first.getRight()); + } + + @Test + void distinguishesRuntimeControllerClasses() { + Pair parent = handlerSpanKeys(Controller.class); + Pair child = handlerSpanKeys(ChildController.class); + + assertNotSame(parent, child); + assertEquals( + "dd.handler.span.datadog.trace.instrumentation.springweb.HandlerSpanKeysTest$ChildController", + child.getLeft()); + } + + static class Controller {} + + static class ChildController extends Controller {} +} 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 2c53417879b..29fa28bd48d 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,testAnnotationProcessor @@ -68,8 +68,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,csiCompileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.minidev:accessors-smart:2.4.7=testCompileClasspath,testRuntimeClasspath @@ -118,7 +118,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.5.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.5.1=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=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 69b259eb33a..28bfc0b1fe7 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.5.34=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -38,8 +38,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -85,8 +85,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.5=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java17CompileClasspath,main_java17RuntimeClasspath,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.minidev:accessors-smart:2.4.7=testCompileClasspath,testRuntimeClasspath @@ -144,7 +144,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.8.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:5.17.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.8.1=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java index 87979e55648..26f37696887 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/ControllerAdvice.java @@ -5,12 +5,12 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromContext; import static datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator.DD_CONTEXT_ATTRIBUTE; -import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_CONTINUE_SUFFIX; -import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_PREFIX_KEY; import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.DECORATE; +import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.handlerSpanKeys; import datadog.context.Context; import datadog.context.ContextScope; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import jakarta.servlet.http.HttpServletRequest; import net.bytebuddy.asm.Advice; @@ -22,8 +22,7 @@ public class ControllerAdvice { public static ContextScope nameResourceAndStartSpan( @Advice.Argument(0) final HttpServletRequest request, @Advice.Argument(2) final Object handler, - @Advice.Local("handlerSpanKey") String handlerSpanKey) { - handlerSpanKey = ""; + @Advice.Local("handlerSpanKeys") Pair handlerSpanKeys) { /* By the time HandlerAdapter.handle runs, every handler mapping kind (annotated and SimpleUrlHandlerMapping via its @@ -44,16 +43,16 @@ By the time HandlerAdapter.handle runs, every handler mapping kind (annotated an // Now create a span for handler/controller execution. - final String handlerKey; + final Class handlerClass; if (handler instanceof HandlerMethod) { - handlerKey = ((HandlerMethod) handler).getBean().getClass().getName(); + handlerClass = ((HandlerMethod) handler).getBean().getClass(); } else { - handlerKey = handler.getClass().getName(); + handlerClass = handler.getClass(); } - handlerSpanKey = DD_HANDLER_SPAN_PREFIX_KEY + handlerKey; + handlerSpanKeys = handlerSpanKeys(handlerClass); // If the context already exists, return it - final Object existingContext = request.getAttribute(handlerSpanKey); + final Object existingContext = request.getAttribute(handlerSpanKeys.getLeft()); if (existingContext instanceof Context) { return ((Context) existingContext).attach(); } @@ -63,7 +62,7 @@ By the time HandlerAdapter.handle runs, every handler mapping kind (annotated an DECORATE.afterStart(span); DECORATE.onHandle(span, handler); - request.setAttribute(handlerSpanKey, span); + request.setAttribute(handlerSpanKeys.getLeft(), span); return span.attachWithContext(); } @@ -72,13 +71,11 @@ public static void stopSpan( @Advice.Enter final ContextScope scope, @Advice.Argument(0) final HttpServletRequest request, @Advice.Thrown final Throwable throwable, - @Advice.Local("handlerSpanKey") String handlerSpanKey) { + @Advice.Local("handlerSpanKeys") Pair handlerSpanKeys) { if (scope == null) { return; } - boolean finish = - !Boolean.TRUE.equals( - request.getAttribute(handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX)); + boolean finish = !Boolean.TRUE.equals(request.getAttribute(handlerSpanKeys.getRight())); final AgentSpan span = spanFromContext(scope.context()); scope.close(); if (throwable != null) { diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java index 17f0e93bbe2..9037203fa25 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/SpringWebHttpServerDecorator.java @@ -1,8 +1,11 @@ package datadog.trace.instrumentation.springweb6; +import static datadog.trace.api.Pair.of; import static datadog.trace.bootstrap.instrumentation.decorator.http.HttpResourceDecorator.HTTP_RESOURCE_DECORATOR; import datadog.context.Context; +import datadog.trace.api.GenericClassValue; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentPropagation; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.URIDataAdapter; @@ -37,6 +40,18 @@ public class SpringWebHttpServerDecorator public static final String DD_HANDLER_SPAN_PREFIX_KEY = "dd.handler.span."; public static final String DD_HANDLER_SPAN_CONTINUE_SUFFIX = ".continue"; + private static final ClassValue> HANDLER_SPAN_KEYS = + GenericClassValue.of( + type -> { + String spanKey = DD_HANDLER_SPAN_PREFIX_KEY + type.getName(); + return of(spanKey, spanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX); + }); + + /** Returns the span attribute key on the left and the continuation attribute key on the right. */ + public static Pair handlerSpanKeys(Class handlerClass) { + return HANDLER_SPAN_KEYS.get(handlerClass); + } + public SpringWebHttpServerDecorator(CharSequence component) { this.component = component; } diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java index 4939751da1b..f32a22406f3 100644 --- a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/main/java17/datadog/trace/instrumentation/springweb6/WrapContinuableResultAdvice.java @@ -1,8 +1,8 @@ package datadog.trace.instrumentation.springweb6; -import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_CONTINUE_SUFFIX; -import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.DD_HANDLER_SPAN_PREFIX_KEY; +import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.handlerSpanKeys; +import datadog.trace.api.Pair; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.java.concurrent.AsyncResultExtensions; import java.util.concurrent.CompletionStage; @@ -24,19 +24,20 @@ public static void after( } ServletWebRequest servletWebRequest = (ServletWebRequest) nativeWebRequest; - final String handlerSpanKey = DD_HANDLER_SPAN_PREFIX_KEY + self.getBean().getClass().getName(); + final Pair handlerSpanKeys = handlerSpanKeys(self.getBean().getClass()); if (Boolean.TRUE.equals( servletWebRequest.getAttribute( - handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX, ServletWebRequest.SCOPE_REQUEST))) { + handlerSpanKeys.getRight(), ServletWebRequest.SCOPE_REQUEST))) { return; } - Object span = servletWebRequest.getAttribute(handlerSpanKey, ServletWebRequest.SCOPE_REQUEST); + Object span = + servletWebRequest.getAttribute(handlerSpanKeys.getLeft(), ServletWebRequest.SCOPE_REQUEST); if (!(span instanceof AgentSpan)) { return; } servletWebRequest.setAttribute( - handlerSpanKey + DD_HANDLER_SPAN_CONTINUE_SUFFIX, true, ServletWebRequest.SCOPE_REQUEST); + handlerSpanKeys.getRight(), true, ServletWebRequest.SCOPE_REQUEST); result = ((CompletionStage) result) .whenComplete(AsyncResultExtensions.finishSpan((AgentSpan) span)); diff --git a/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java new file mode 100644 index 00000000000..68dd350f755 --- /dev/null +++ b/dd-java-agent/instrumentation/spring/spring-webmvc/spring-webmvc-6.0/src/test/java/datadog/trace/instrumentation/springweb6/HandlerSpanKeysTest.java @@ -0,0 +1,40 @@ +package datadog.trace.instrumentation.springweb6; + +import static datadog.trace.instrumentation.springweb6.SpringWebHttpServerDecorator.handlerSpanKeys; +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.api.Pair; +import org.junit.jupiter.api.Test; + +class HandlerSpanKeysTest { + @Test + void reusesKeysForTheSameControllerClass() { + Pair first = handlerSpanKeys(Controller.class); + Pair second = handlerSpanKeys(Controller.class); + + assertSame(first, second); + assertSame(first.getLeft(), second.getLeft()); + assertSame(first.getRight(), second.getRight()); + assertEquals( + "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$Controller", + first.getLeft()); + assertEquals(first.getLeft() + ".continue", first.getRight()); + } + + @Test + void distinguishesRuntimeControllerClasses() { + Pair parent = handlerSpanKeys(Controller.class); + Pair child = handlerSpanKeys(ChildController.class); + + assertNotSame(parent, child); + assertEquals( + "dd.handler.span.datadog.trace.instrumentation.springweb6.HandlerSpanKeysTest$ChildController", + child.getLeft()); + } + + static class Controller {} + + static class ChildController extends Controller {} +} 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 1f21dd45f59..f39b3cd0f5a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -29,8 +29,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -71,8 +71,8 @@ jakarta.xml.ws:jakarta.xml.ws-api:2.3.3=latestDepTestCompileClasspath,latestDepT javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -120,7 +120,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.staxex:stax-ex:1.8.3=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=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 27489900de4..ce875f272b5 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile +++ b/dd-java-agent/instrumentation/spymemcached-2.10/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -59,8 +59,8 @@ io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRunt javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java index aa6b5adfc4e..840429b1cb4 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/MemcachedClientInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.spymemcached.MemcacheClientDecorator.COMPONENT_NAME; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; @@ -11,10 +12,10 @@ import static net.bytebuddy.matcher.ElementMatchers.returns; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import net.bytebuddy.asm.Advice; import net.spy.memcached.MemcachedClient; @@ -75,7 +76,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class AsyncOperationAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter() { + public static ContextScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } @@ -85,17 +86,17 @@ public static AgentScope methodEnter() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Origin("#m") final String methodName, @Advice.Return final OperationFuture future) { if (scope == null) { return; } CallDepthThreadLocalMap.reset(MemcachedClient.class); - try (final AgentScope toClose = scope) { + try (final ContextScope toClose = scope) { if (future != null) { final OperationCompletionListener listener = - new OperationCompletionListener(scope.span(), methodName); + new OperationCompletionListener(spanFromScope(scope), methodName); future.addListener(listener); } } @@ -105,7 +106,7 @@ public static void methodExit( public static class AsyncGetAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter() { + public static ContextScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } @@ -115,17 +116,17 @@ public static AgentScope methodEnter() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Origin("#m") final String methodName, @Advice.Return final GetFuture future) { if (scope == null) { return; } CallDepthThreadLocalMap.reset(MemcachedClient.class); - try (final AgentScope toClose = scope) { + try (final ContextScope toClose = scope) { if (future != null) { final GetCompletionListener listener = - new GetCompletionListener(scope.span(), methodName); + new GetCompletionListener(spanFromScope(scope), methodName); future.addListener(listener); } } @@ -135,7 +136,7 @@ public static void methodExit( public static class AsyncBulkAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter() { + public static ContextScope methodEnter() { if (CallDepthThreadLocalMap.incrementCallDepth(MemcachedClient.class) > 0) { return null; } @@ -145,17 +146,17 @@ public static AgentScope methodEnter() { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Origin("#m") final String methodName, @Advice.Return final BulkFuture future) { if (scope == null) { return; } CallDepthThreadLocalMap.reset(MemcachedClient.class); - try (final AgentScope toClose = scope) { + try (final ContextScope toClose = scope) { if (future != null) { final BulkGetCompletionListener listener = - new BulkGetCompletionListener(scope.span(), methodName); + new BulkGetCompletionListener(spanFromScope(scope), methodName); future.addListener(listener); } } diff --git a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java index 4c68c360df0..dbb2db12f8c 100644 --- a/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java +++ b/dd-java-agent/instrumentation/spymemcached-2.10/src/main/java/datadog/trace/instrumentation/spymemcached/SyncCompletionListener.java @@ -1,6 +1,6 @@ package datadog.trace.instrumentation.spymemcached; -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 java.util.concurrent.ExecutionException; @@ -9,7 +9,7 @@ public class SyncCompletionListener extends CompletionListener { private static final Logger log = LoggerFactory.getLogger(SyncCompletionListener.class); - private final AgentScope scope; + private final ContextScope scope; public SyncCompletionListener(final AgentSpan span, final String methodName) { super(span, methodName); diff --git a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile index bc12e3dab41..2a900d9fee4 100644 --- a/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/synapse-3.0/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -81,8 +81,8 @@ jline:jline:0.9.94=compileClasspath,latestDepTestCompileClasspath,latestDepTestR junit:junit:3.8.1=compileClasspath,latestDepTestCompileClasspath,testCompileClasspath junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.14=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -173,7 +173,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 00e21819e1e..be5df0bd395 100644 --- a/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-6.4/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.12=compileClasspath,testCompileClasspath,testRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -63,8 +63,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:3.8.1=compileClasspath,testCompileClasspath junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testRuntimeClasspath net.minidev:accessors-smart:2.4.9=testRuntimeClasspath @@ -113,7 +113,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 87ebdb179b3..b26e9a43e22 100644 --- a/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-7.0/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.72=compileClasspath,testCompileClasspath,testRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,testng751TestAnnotationProcessor @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,te javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,testng751TestRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,testng751TestCompileClasspath,testng751TestRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 c4ad5212f5d..9418dec5721 100644 --- a/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/testng/testng-common/gradle.lockfile @@ -10,7 +10,7 @@ com.beust:jcommander:1.12=compileClasspath,testFixturesCompileClasspath,testFixt com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -63,8 +63,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testFixturesCompileCl jaxen:jaxen:2.0.6=spotbugs junit:junit:3.8.1=compileClasspath,testFixturesCompileClasspath junit:junit:4.13.2=testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=testFixturesRuntimeClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.9=testFixturesRuntimeClasspath,testRuntimeClasspath @@ -113,7 +113,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testFixturesRuntimeClasspath,tes org.junit.platform:junit-platform-suite-api:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 ae76a74f615..5756abee8ed 100644 --- a/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/thymeleaf-3.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 5d05b76aecb..740e136ba60 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 d99a6c9b5a9..7fc80718d74 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 @@ -17,7 +17,6 @@ import datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers; 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 java.util.Map; import net.bytebuddy.asm.Advice; @@ -54,7 +53,7 @@ public static boolean before( @Advice.This Task self, @Advice.Argument(0) ProcessContext processContext, @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo, - @Advice.Local("ddScope") AgentScope ddScope) { + @Advice.Local("ddScope") ContextScope ddScope) { ContextStore store = InstrumentationContext.get(ProcessContext.class, Map.class); @@ -87,7 +86,7 @@ public static void after( @Advice.Return String ret, @Advice.Enter boolean traced, @Advice.Local("ddActivityInfo") ActivityHelper.ActivityInfo ddActivityInfo, - @Advice.Local("ddScope") AgentScope ddScope) { + @Advice.Local("ddScope") ContextScope ddScope) { try (ContextScope closeMe = ddScope) { if (!traced) { return; 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 26c1a0daa76..a620ec04405 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath 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 c777f20d872..ea80578b11f 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 @@ -5,6 +5,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; @@ -16,11 +17,11 @@ import com.tibco.pvm.api.behavior.PmBehavior; import com.tibco.pvm.api.event.PmEvent; 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.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; @@ -69,7 +70,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ActivityEvalAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope activityBegin( + public static ContextScope activityBegin( @Advice.This final Object self, @Advice.Argument(0) final PmContext pmContext, @Advice.Argument(1) final PmTask pmTask) { @@ -101,14 +102,14 @@ public static AgentScope activityBegin( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void activityEnd( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.This final PmBehavior self, @Advice.Argument(0) final PmContext pmContext, @Advice.Argument(1) final PmTask pmTask) { if (scope == null) { return; } - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); boolean finished = false; try { finished = self.isFinished(pmContext, pmTask); 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 0f96fff0432..4ffccf14221 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 b5c045266ed..adcbf7a85eb 100644 --- a/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tinylog-2.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 875b4598cf4..d163dd9f26b 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/gradle.lockfile @@ -2,147 +2,146 @@ # Manual edits can break the build 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 -ch.qos.logback:logback-core:1.2.13=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.datadoghq.okhttp3:okhttp:3.12.15=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.datadoghq.okio:okio:1.17.6=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.datadoghq:java-dogstatsd-client:4.4.5=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.datadoghq:sketches-java:0.8.3=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +cafe.cryptography:curve25519-elisabeth:0.1.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +cafe.cryptography:ed25519-elisabeth:0.1.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +ch.qos.logback:logback-classic:1.2.13=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +ch.qos.logback:logback-core:1.2.13=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.datadoghq.okhttp3:okhttp:3.12.15=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.datadoghq.okio:okio:1.17.6=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.datadoghq:java-dogstatsd-client:4.4.5=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.datadoghq:sketches-java:0.8.3=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.jnr:jffi:1.3.15=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.github.jnr:jnr-a64asm:1.0.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.github.jnr:jnr-constants:0.10.4=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.github.jnr:jnr-enxio:0.32.20=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -com.github.jnr:jnr-ffi:2.2.19=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.jnr:jffi:1.3.15=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-a64asm:1.0.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-constants:0.10.4=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-enxio:0.32.20=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-ffi:2.2.19=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-posix:3.1.22=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-unixsocket:0.38.25=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.jnr:jnr-x86asm:1.0.2=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 -com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.auto:auto-common:1.2.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latest10ForkedTestAnnotationProcessor,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestAnnotationProcessor,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestAnnotationProcessor,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,latest10ForkedTestAnnotationProcessor,latest10ForkedTestCompileClasspath,latest10TestAnnotationProcessor,latest10TestCompileClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.auto:auto-common:1.2.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.code.findbugs:jsr305:3.0.2=annotationProcessor,compileClasspath,latest10ForkedTestAnnotationProcessor,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestAnnotationProcessor,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.code.gson:gson:2.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.47.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor -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: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 -com.squareup.okhttp3:okhttp:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -com.squareup.okio:okio:1.17.5=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.guava:failureaccess:1.0.1=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.guava:failureaccess:1.0.3=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.guava:guava:32.0.1-jre=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.guava:guava:33.6.0-jre=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,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,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testAnnotationProcessor,testCompileClasspath,testRuntimeClasspath,tomcat9TestAnnotationProcessor,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.j2objc:j2objc-annotations:2.8=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +com.google.j2objc:j2objc-annotations:3.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.google.re2j:re2j:1.8=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +com.squareup.moshi:moshi:1.11.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.squareup.okhttp3:logging-interceptor:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.squareup.okhttp3:okhttp:3.12.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +com.squareup.okio:okio:1.17.5=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc commons-beanutils:commons-beanutils:1.6=testCompileClasspath,testRuntimeClasspath -commons-codec:commons-codec:1.19.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-codec:commons-codec:1.19.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-collections:commons-collections:2.1=testCompileClasspath,testRuntimeClasspath commons-digester:commons-digester:1.4.1=testCompileClasspath,testRuntimeClasspath -commons-fileupload:commons-fileupload:1.5=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +commons-fileupload:commons-fileupload:1.5=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath commons-io:commons-io:2.11.0=testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath commons-io:commons-io:2.21.0=spotbugs -commons-io:commons-io:2.22.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +commons-io:commons-io:2.22.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-logging:commons-logging-api:1.0.4=testCompileClasspath,testRuntimeClasspath commons-logging:commons-logging:1.0=testCompileClasspath,testRuntimeClasspath commons-modeler:commons-modeler:2.0.1=testCompileClasspath,testRuntimeClasspath -de.thetaphi:forbiddenapis:3.10=compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -io.leangen.geantyref:geantyref:1.3.16=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -io.sqreen:libsqreen:17.5.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +io.sqreen:libsqreen:17.5.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath javax.servlet:servlet-api:2.4=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -junit:junit:4.13.2=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -net.java.dev.jna:jna-platform:5.8.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -net.java.dev.jna:jna:5.8.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +junit:junit:4.13.2=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +net.java.dev.jna:jna-platform:5.8.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +net.java.dev.jna:jna:5.8.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc -org.apache.bcel:bcel:6.12.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs -org.apache.commons:commons-compress:1.28.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.commons:commons-lang3:3.20.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +org.apache.bcel:bcel:6.12.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs +org.apache.commons:commons-compress:1.28.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.commons:commons-lang3:3.20.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,spotbugs org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs -org.apache.tomcat.embed:tomcat-embed-core:10.1.59=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:11.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-core:9.0.121=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:10.1.59=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:11.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat.embed:tomcat-embed-websocket:9.0.121=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.59=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:11.0.25=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -org.apache.tomcat:tomcat-annotations-api:9.0.121=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:10.1.60=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:11.0.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-core:9.0.122=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:10.1.60=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:11.0.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat.embed:tomcat-embed-websocket:9.0.122=tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.apache.tomcat:jakartaee-migration:1.0.12=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:10.1.60=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:11.0.26=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.apache.tomcat:tomcat-annotations-api:9.0.122=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 -org.checkerframework:checker-qual:3.33.0=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor +org.apiguardian:apiguardian-api:1.1.2=latest10ForkedTestCompileClasspath,latest10TestCompileClasspath,latestDepTestCompileClasspath,testCompileClasspath,tomcat9TestCompileClasspath +org.checkerframework:checker-qual:3.33.0=annotationProcessor,latest10ForkedTestAnnotationProcessor,latest10TestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,tomcat9TestAnnotationProcessor 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=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.codehaus.groovy:groovy-json:3.0.25=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath 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=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.codehaus.groovy:groovy:3.0.25=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.codenarc:CodeNarc:3.7.0=codenarc org.dom4j:dom4j:2.2.0=spotbugs -org.eclipse.platform:org.eclipse.osgi:3.24.100=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +org.eclipse.platform:org.eclipse.osgi:3.24.100=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.gmetrics:GMetrics:2.1.0=codenarc -org.hamcrest:hamcrest-core:1.3=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -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 -org.junit.jupiter:junit-jupiter:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-commons:1.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-engine:1.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-launcher:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-runner:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-suite-api:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.junit.platform:junit-platform-suite-commons:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.junit:junit-bom:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -org.mockito:mockito-core:4.4.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.objenesis:objenesis:3.3=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.opentest4j:opentest4j:1.3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.hamcrest:hamcrest-core:1.3=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.hamcrest:hamcrest:3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.jctools:jctools-core-jdk11:4.0.6=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.jctools:jctools-core:4.0.6=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.jspecify:jspecify:1.0.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.jupiter:junit-jupiter-api:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.jupiter:junit-jupiter-engine:5.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.junit.jupiter:junit-jupiter-params:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.jupiter:junit-jupiter:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-commons:1.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-engine:1.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-launcher:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-runner:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-suite-api:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.junit.platform:junit-platform-suite-commons:1.14.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.junit:junit-bom:5.14.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.mockito:mockito-core:4.4.0=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.objenesis:objenesis:3.3=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.opentest4j:opentest4j:1.3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.ow2.asm:asm-analysis:9.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath,tomcat9TestRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.slf4j:jcl-over-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.slf4j:jul-to-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.slf4j:log4j-over-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.ow2.asm:asm-util:9.7.1=latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.slf4j:jcl-over-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.slf4j:jul-to-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.slf4j:log4j-over-slf4j:1.7.30=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.slf4j:slf4j-api:1.7.30=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath -org.slf4j:slf4j-api:1.7.32=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath -org.spockframework:spock-bom:2.4-groovy-3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.spockframework:spock-core:2.4-groovy-3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.tabletest:tabletest-junit:1.2.2=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latest10ForkedTestRuntimeClasspath,latest10TestRuntimeClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testRuntimeClasspath,tomcat9TestRuntimeClasspath +org.spockframework:spock-bom:2.4-groovy-3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.spockframework:spock-core:2.4-groovy-3.0=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.tabletest:tabletest-junit:1.2.2=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=latest10ForkedTestCompileClasspath,latest10ForkedTestRuntimeClasspath,latest10TestCompileClasspath,latest10TestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,tomcat9TestCompileClasspath,tomcat9TestRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs tomcat:catalina:5.5.12=compileClasspath,testCompileClasspath,testRuntimeClasspath tomcat:naming-factory:5.5.12=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatServletTest.groovy b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatServletTest.groovy index 71169702543..57f9f81cc4a 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatServletTest.groovy +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/latestDepTest/groovy/TomcatServletTest.groovy @@ -1,9 +1,7 @@ import datadog.trace.agent.test.base.HttpServer import datadog.trace.api.ProcessTags -import datadog.trace.instrumentation.servlet5.HtmlAsyncRumServlet import datadog.trace.instrumentation.servlet5.HtmlRumServlet import datadog.trace.instrumentation.servlet5.TestServlet5 -import datadog.trace.instrumentation.servlet5.XmlAsyncRumServlet import datadog.trace.instrumentation.servlet5.XmlRumServlet import jakarta.servlet.Filter import jakarta.servlet.Servlet @@ -20,6 +18,8 @@ import org.apache.tomcat.util.descriptor.web.ContextEnvironment import org.apache.tomcat.util.descriptor.web.FilterDef import org.apache.tomcat.util.descriptor.web.FilterMap import spock.lang.IgnoreIf +import test.servlet5.HtmlAsyncRumServlet +import test.servlet5.XmlAsyncRumServlet import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.CUSTOM_EXCEPTION import static datadog.trace.agent.test.base.HttpServerTest.ServerEndpoint.EXCEPTION @@ -320,7 +320,3 @@ class TomcatAsyncRumInjectionForkedTest extends TomcatRumInjectionForkedTest { addServlet(context, "/gimme-xml", XmlAsyncRumServlet) } } - - - - diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java index bc178cba700..d075465806d 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/tomcat/tomcat-5.5/src/main/java/datadog/trace/instrumentation/tomcat/WsHttpUpgradeHandlerInstrumentation.java @@ -4,10 +4,10 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; 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.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import java.util.Collections; import java.util.Map; @@ -44,7 +44,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class CaptureHandshakeSpanAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.FieldValue("handshakeRequest") final WsHandshakeRequest request) { final AgentSpan span = InstrumentationContext.get(WsHandshakeRequest.class, AgentSpan.class).get(request); @@ -52,7 +52,7 @@ public static AgentScope before( } @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) - public static void after(@Advice.Enter final AgentScope scope) { + public static void after(@Advice.Enter final ContextScope scope) { if (scope != null) { scope.close(); } 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 7b962ea06b6..5745e2b43d2 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-9.0/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -108,7 +108,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 2a986b3b807..95564dd6669 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 3ee8220fde2..a05f54b0a75 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 6539908f573..dd94b02ee96 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -105,7 +105,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java index e4c4a953c17..f48f91130fc 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java +++ b/dd-java-agent/instrumentation/tomcat/tomcat-appsec/tomcat-appsec-7.0/src/test/java/datadog/trace/instrumentation/tomcat7/GlassFishBlockingHelperTest.java @@ -159,7 +159,8 @@ void tryBlock_brfThrows_returnsFalse() throws Exception { RequestContext reqCtx = mockReqCtx(brf, segment); doThrow(new RuntimeException("commit failed")) .when(brf) - .tryCommitBlockingResponse(any(), any(Flow.Action.RequestBlockingAction.class)); + .tryCommitBlockingResponse( + any(TraceSegment.class), any(Flow.Action.RequestBlockingAction.class)); assertFalse(GlassFishBlockingHelper.tryBlock(reqCtx, null, null, rba(403))); verify(segment, never()).effectivelyBlocked(); diff --git a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile index c5a0975ed81..4f7f97d49e1 100644 --- a/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/tomcat/tomcat-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.servlet:servlet-api:2.4=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 161a054cea1..995442e4ca8 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/twilio-0.0.1/gradle.lockfile @@ -10,7 +10,7 @@ com.auth0:java-jwt:4.4.0=latestDepTestCompileClasspath,latestDepTestRuntimeClass 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-instrument-java:0.0.5=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 @@ -33,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -60,7 +60,7 @@ com.squareup.okhttp3:okhttp:3.12.12=latestDepTestCompileClasspath,latestDepTestR com.squareup.okio:okio:1.17.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.thoughtworks.qdox:qdox:1.12.1=codenarc com.twilio.sdk:twilio:0.0.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.twilio.sdk:twilio:13.0.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.twilio.sdk:twilio:13.0.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-codec:commons-codec:1.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath commons-codec:commons-codec:1.9=compileClasspath,testCompileClasspath,testRuntimeClasspath commons-fileupload:commons-fileupload:1.5=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -82,8 +82,8 @@ javax.xml.stream:stax-api:1.0-2=compileClasspath,testCompileClasspath,testRuntim jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.5=compileClasspath,testCompileClasspath,testRuntimeClasspath 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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -132,7 +132,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java index 4af01fc11ad..d5f195939d1 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioAsyncInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.twilio.TwilioClientDecorator.DECORATE; import static datadog.trace.instrumentation.twilio.TwilioClientDecorator.TWILIO_SDK; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -16,10 +17,10 @@ import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.ListenableFuture; import com.twilio.Twilio; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -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; @@ -89,7 +90,7 @@ public static class TwilioClientAsyncAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final Object that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level Twilio client method; except in the @@ -114,14 +115,14 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final ListenableFuture response) { if (scope == null) { return; } // If we have a scope (i.e. we were the top-level Twilio SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); if (throwable != null) { // There was a synchronous error, // which means we shouldn't wait for a callback to close the span. diff --git a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java index d7697800f90..b83bd611637 100644 --- a/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java +++ b/dd-java-agent/instrumentation/twilio-0.0.1/src/main/java/datadog/trace/instrumentation/twilio/TwilioSyncInstrumentation.java @@ -4,6 +4,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.namedOneOf; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.twilio.TwilioClientDecorator.DECORATE; import static datadog.trace.instrumentation.twilio.TwilioClientDecorator.TWILIO_SDK; import static net.bytebuddy.matcher.ElementMatchers.isMethod; @@ -11,10 +12,10 @@ import com.google.auto.service.AutoService; import com.twilio.Twilio; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.agent.tooling.InstrumenterModule; import datadog.trace.bootstrap.CallDepthThreadLocalMap; -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; @@ -73,7 +74,7 @@ public static class TwilioClientAdvice { /** Method entry instrumentation. */ @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This final Object that, @Advice.Origin("#m") final String methodName) { // Ensure that we only create a span for the top-level Twilio client method; except in the @@ -95,7 +96,7 @@ public static AgentScope methodEnter( /** Method exit instrumentation. */ @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable, @Advice.Return final Object response) { if (scope == null) { @@ -103,7 +104,7 @@ public static void methodExit( } // If we have a scope (i.e. we were the top-level Twilio SDK invocation), - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onResult(span, response); DECORATE.onError(span, throwable); DECORATE.beforeFinish(span); diff --git a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile index 791f874dc98..916181d7f04 100644 --- a/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile +++ b/dd-java-agent/instrumentation/unbescape-1.1/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -22,8 +22,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -97,7 +97,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 a67159a120d..767c35421b9 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -61,8 +61,8 @@ io.undertow:undertow-websockets-jsr:2.2.40.Final=latestDepForkedTestCompileClass javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -116,7 +116,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 faf6908f683..6d3510d9c28 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-2.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latest22ForkedTestCompileClasspath,latest22Fo com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latest22ForkedTestAnnotationProcessor,latest22TestAnnotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -79,8 +79,8 @@ jakarta.websocket:jakarta.websocket-client-api:2.1.0=latestDepForkedTestCompileC javax.servlet:javax.servlet-api:3.1.0=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.8.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -131,7 +131,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latest22ForkedTestRuntimeClasspa org.junit.platform:junit-platform-suite-api:1.14.1=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latest22ForkedTestRuntimeClasspath,latest22TestRuntimeClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latest22ForkedTestCompileClasspath,latest22ForkedTestRuntimeClasspath,latest22TestCompileClasspath,latest22TestRuntimeClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 5d73d098275..614278504c4 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile +++ b/dd-java-agent/instrumentation/undertow/undertow-common/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ io.undertow:undertow-core:2.0.0.Final=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java index a9dbc130978..f389a9614f2 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java +++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/HttpServerExchangeURIDataAdapter.java @@ -1,6 +1,7 @@ package datadog.trace.instrumentation.undertow; import datadog.trace.bootstrap.instrumentation.api.URIRawDataAdapter; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import io.undertow.server.HttpServerExchange; final class HttpServerExchangeURIDataAdapter extends URIRawDataAdapter { @@ -16,13 +17,33 @@ public String scheme() { } @Override + @SuppressFBWarnings( + value = "DCN_NULLPOINTER_EXCEPTION", + justification = + "getHostName() NPEs inside Undertow itself, not on a null we could check beforehand" + + " (e.g. no Host header and a connection whose local address isn't an" + + " InetSocketAddress, such as AJP or a Unix domain socket transport)") public String host() { - return httpServerExchange.getHostName(); + try { + return httpServerExchange.getHostName(); + } catch (final NullPointerException e) { + return null; + } } @Override + @SuppressFBWarnings( + value = "DCN_NULLPOINTER_EXCEPTION", + justification = + "getHostPort() NPEs inside Undertow itself, not on a null we could check beforehand" + + " (e.g. no Host header and a connection whose local address isn't an" + + " InetSocketAddress, such as AJP or a Unix domain socket transport)") public int port() { - return httpServerExchange.getHostPort(); + try { + return httpServerExchange.getHostPort(); + } catch (final NullPointerException e) { + return 0; + } } @Override diff --git a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java index e4876b8c670..a8e2a1a6c8a 100644 --- a/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java +++ b/dd-java-agent/instrumentation/undertow/undertow-common/src/main/java/datadog/trace/instrumentation/undertow/UndertowDecorator.java @@ -12,6 +12,7 @@ import datadog.trace.bootstrap.instrumentation.decorator.HttpServerDecorator; import io.undertow.server.HttpServerExchange; import io.undertow.util.AttachmentKey; +import java.net.InetSocketAddress; public class UndertowDecorator extends HttpServerDecorator< @@ -84,7 +85,11 @@ protected String peerHostIP(final HttpServerExchange exchange) { @Override protected int peerPort(final HttpServerExchange exchange) { - return exchange.getDestinationAddress().getPort(); + // getDestinationAddress() can be null in the same situations that make + // HttpServerExchangeURIDataAdapter#port() NPE internally (e.g. AJP, a Unix domain socket + // transport, or a wrapped/detached ServerConnection). + InetSocketAddress destination = exchange.getDestinationAddress(); + return destination == null ? UNSET_PORT : destination.getPort(); } @Override 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 cc3a25ae8fd..aa776d1f1a0 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile +++ b/dd-java-agent/instrumentation/valkey-java-5.3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -23,8 +23,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ io.valkey:valkey-java:5.5.0=latestDepTestCompileClasspath,latestDepTestRuntimeCl javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -103,7 +103,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java index 5aa4b9766a9..a6c23153391 100644 --- a/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java +++ b/dd-java-agent/instrumentation/valkey-java-5.3/src/main/java/datadog/trace/instrumentation/valkey/ValkeyInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static io.valkey.ValkeyClientDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; 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 io.valkey.CommandObject; import io.valkey.Connection; @@ -53,7 +54,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class ValkeyAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Argument(0) final CommandObject commandObject, @Advice.This final Connection thiz) { final AgentSpan span = startSpan("valkey-command", ValkeyClientDecorator.OPERATION_NAME); @@ -72,11 +73,12 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void stopSpan( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable throwable) { - DECORATE.onError(scope.span(), throwable); - DECORATE.beforeFinish(scope.span()); + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable throwable) { + AgentSpan span = spanFromScope(scope); + DECORATE.onError(span, throwable); + DECORATE.beforeFinish(span); scope.close(); - scope.span().finish(); + span.finish(); } } } diff --git a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile index a0e5ee8fce0..dc7be28db00 100644 --- a/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/velocity-1.5/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath 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 @@ -24,8 +24,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.10.3=compileClasspath,csiCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,csiCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -71,8 +71,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath log4j:log4j:1.2.12=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath logkit:logkit:1.0.1=compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,csiCompileClasspath,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.10=spotbugs @@ -120,7 +120,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 920065cde6e..079bf2c043e 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -99,8 +99,8 @@ javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latest jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -143,7 +143,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 90400addfd1..140400a47b0 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 @@ -9,15 +9,15 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.docker-java:docker-java-api:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -60,45 +60,45 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked commons-io:commons-io:2.21.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.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.81.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.84.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-core:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-mysql-client:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-mysql-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-mysql-client:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-sql-client:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-sql-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-sql-client:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath mysql:mysql-connector-java:8.0.23=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -141,7 +141,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 3f846702584..eddd751f715 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 @@ -10,7 +10,7 @@ ch.randelshofer:fastdoubleparser:0.8.0=compileClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -25,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -74,8 +74,8 @@ io.vertx:vertx-sql-client:4.4.2=compileClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -116,7 +116,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 46d6ab26f0e..31580c80fdc 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 @@ -9,15 +9,15 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 com.fasterxml.jackson.core:jackson-annotations:2.10.3=testCompileClasspath,testRuntimeClasspath com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-core:2.11.4=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.docker-java:docker-java-api:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -67,44 +67,44 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked commons-io:commons-io:2.21.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.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.81.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.84.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.65.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-core:4.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-pg-client:4.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-pg-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-pg-client:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-sql-client:4.1.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-sql-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-sql-client:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -148,7 +148,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 ab25208f07a..3fcc0ed3a73 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 @@ -10,7 +10,7 @@ ch.randelshofer:fastdoubleparser:0.8.0=compileClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -25,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -74,8 +74,8 @@ io.vertx:vertx-sql-client:4.4.2=compileClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -116,7 +116,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 b658d414f69..909f5c18df6 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath @@ -20,12 +20,12 @@ com.fasterxml.jackson.core:jackson-annotations:2.21=latestDepForkedTestCompileCl com.fasterxml.jackson.core:jackson-core:2.10.2=compileClasspath,testCompileClasspath com.fasterxml.jackson.core:jackson-core:2.11.3=redis4xForkedTestCompileClasspath,redis4xTestCompileClasspath com.fasterxml.jackson.core:jackson-core:2.13.2=redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson.core:jackson-databind:2.10.2=compileClasspath,testCompileClasspath com.fasterxml.jackson.core:jackson-databind:2.13.2.1=redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-databind:2.21.5=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.21.6=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.13.2.1=redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.github.docker-java:docker-java-api:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport-zerodep:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.github.docker-java:docker-java-transport:3.4.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,redis4xForkedTestAnnotationProcessor,redis4xTestAnnotationProcessor,testAnnotationProcessor @@ -70,42 +70,42 @@ commons-io:commons-io:2.11.0=latestDepForkedTestCompileClasspath,latestDepForked commons-io:commons-io:2.21.0=spotbugs de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath io.leangen.geantyref:geantyref:1.3.16=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath -io.netty:netty-buffer:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-buffer:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-dns:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http2:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-http:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec-socks:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec-socks:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-codec:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-common:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-handler-proxy:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler-proxy:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-handler:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-resolver-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver-dns:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-resolver:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.81.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.84.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.48.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath io.netty:netty-transport:4.1.49.Final=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath io.reactivex.rxjava2:rxjava:2.2.12=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -113,26 +113,26 @@ io.reactivex.rxjava2:rxjava:2.2.21=latestDepForkedTestCompileClasspath,latestDep io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-codegen:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-codegen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-codegen:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-codegen:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-core:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-core:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-redis-client:3.9.0=compileClasspath,testCompileClasspath,testRuntimeClasspath io.vertx:vertx-redis-client:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-redis-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-redis-client:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-gen:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-rx-gen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-gen:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-gen:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-java2-gen:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-java2-gen:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-java2-gen:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-rx-java2:3.9.0=testCompileClasspath,testRuntimeClasspath io.vertx:vertx-rx-java2:4.0.0=redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath -io.vertx:vertx-rx-java2:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-rx-java2:4.5.34=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -179,7 +179,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp org.junit.platform:junit-platform-suite-api:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestRuntimeClasspath,testRuntimeClasspath org.mvel:mvel2:2.3.1.Final=testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,redis4xForkedTestCompileClasspath,redis4xForkedTestRuntimeClasspath,redis4xTestCompileClasspath,redis4xTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath 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/RedisAPICallAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java index 7d7e599ec64..3c30d57b825 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisAPICallAdvice.java @@ -6,9 +6,9 @@ import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -21,7 +21,7 @@ public class RedisAPICallAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeCall( + public static ContextScope beforeCall( @Advice.Origin final Method currentMethod, @Advice.This final RedisAPI self, @Advice.Argument( @@ -110,7 +110,7 @@ public static AgentScope beforeCall( The potential racy condition when the handler may be added to an already finished task is handled by RedisAPIImplSendAdvice. */ - AgentScope scope = activateSpan(clientSpan); + ContextScope scope = activateSpan(clientSpan); ResponseHandlerWrapper respHandler = new ResponseHandlerWrapper(handler, clientSpan, parentContinuation); handler = respHandler; @@ -144,7 +144,7 @@ public static AgentScope beforeCall( public static void afterCall( @Advice.Thrown final Throwable throwable, @Advice.This final RedisAPI self, - @Advice.Enter final AgentScope scope) { + @Advice.Enter final ContextScope scope) { CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class); if (null == scope) { 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/RedisFutureSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java index 0b105d498f1..cddcaf380cc 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisFutureSendAdvice.java @@ -3,14 +3,15 @@ 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.noopSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.REDIS_COMMAND; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; 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 datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import io.vertx.core.Future; @@ -26,7 +27,7 @@ public class RedisFutureSendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeSend( + public static ContextScope beforeSend( @Advice.Argument(value = 0, readOnly = false) Request request, @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation) throws Throwable { @@ -73,14 +74,14 @@ public static AgentScope beforeSend( public static void afterSend( @Advice.Return(readOnly = false) Future responseFuture, @Advice.Local("ddParentContinuation") ContextContinuation parentContinuation, - @Advice.Enter final AgentScope clientScope, + @Advice.Enter final ContextScope clientScope, @Advice.This final Object thiz) { CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class); if (thiz instanceof RedisConnection) { final SocketAddress socketAddress = InstrumentationContext.get(RedisConnection.class, SocketAddress.class) .get((RedisConnection) thiz); - final AgentSpan span = clientScope != null ? clientScope.span() : activeSpan(); + final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan(); // Verify the activeSpan() fallback is actually a REDIS_COMMAND span if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) { DECORATE.onConnection(span, socketAddress); @@ -90,7 +91,7 @@ public static void afterSend( if (clientScope != null) { Promise promise = Promise.promise(); responseFuture.onComplete( - new ResponseHandler(promise, clientScope.span(), parentContinuation)); + new ResponseHandler(promise, spanFromScope(clientScope), parentContinuation)); responseFuture = promise.future(); clientScope.close(); } 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/RedisSendAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java index e7b4303e3b8..7a127a51b83 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-redis-client/vertx-redis-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_redis_client/RedisSendAdvice.java @@ -3,14 +3,15 @@ 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.noopSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.DECORATE; import static datadog.trace.instrumentation.vertx_redis_client.VertxRedisClientDecorator.REDIS_COMMAND; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.bootstrap.CallDepthThreadLocalMap; 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 datadog.trace.bootstrap.instrumentation.api.UTF8BytesString; import io.vertx.core.AsyncResult; @@ -27,7 +28,7 @@ public class RedisSendAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeSend( + public static ContextScope beforeSend( @Advice.Argument(value = 0, readOnly = false) Request request, @Advice.Argument(value = 1, readOnly = false) Handler> handler) throws Throwable { @@ -75,13 +76,13 @@ public static AgentScope beforeSend( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterSend( - @Advice.Enter final AgentScope clientScope, @Advice.This final Object thiz) { + @Advice.Enter final ContextScope clientScope, @Advice.This final Object thiz) { CallDepthThreadLocalMap.decrementCallDepth(RedisAPI.class); if (thiz instanceof RedisConnection) { final SocketAddress socketAddress = InstrumentationContext.get(RedisConnection.class, SocketAddress.class) .get((RedisConnection) thiz); - final AgentSpan span = clientScope != null ? clientScope.span() : activeSpan(); + final AgentSpan span = clientScope != null ? spanFromScope(clientScope) : activeSpan(); // Verify the activeSpan() fallback is actually a REDIS_COMMAND span if (socketAddress != null && span != null && REDIS_COMMAND.equals(span.getOperationName())) { DECORATE.onConnection(span, socketAddress); 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 3df3773fbd1..a14d0b621e0 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 @@ -8,8 +8,8 @@ com.fasterxml.jackson.core:jackson-annotations:2.10.2=compileClasspath com.fasterxml.jackson.core:jackson-core:2.10.2=compileClasspath com.fasterxml.jackson.core:jackson-databind:2.10.2=compileClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc -com.github.spotbugs:spotbugs-annotations:4.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -65,7 +65,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 7bb9a033de1..2437d12f125 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -107,8 +107,8 @@ io.vertx:vertx-web:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTes javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -151,7 +151,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath org.mvel:mvel2:2.3.1.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath org.objenesis:objenesis:3.3=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 cefb1040131..7a66948e697 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -25,8 +25,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -72,8 +72,8 @@ io.vertx:vertx-sql-client:3.9.0=compileClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -114,7 +114,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java index bba044739d7..b02165e8b0f 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/CursorReadAdvice.java @@ -5,9 +5,9 @@ import static datadog.trace.instrumentation.vertx_sql_client_39.VertxSqlClientDecorator.DECORATE; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.api.Pair; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -19,7 +19,7 @@ public class CursorReadAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beforeRead( + public static ContextScope beforeRead( @Advice.Argument(value = 1, readOnly = false) Handler>> handler, @Advice.FieldValue(value = "ps", typing = Assigner.Typing.DYNAMIC) final PreparedStatement ps) { @@ -42,7 +42,7 @@ public static AgentScope beforeRead( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterRead( - @Advice.Thrown final Throwable throwable, @Advice.Enter final AgentScope clientScope) { + @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) { if (null != clientScope) { clientScope.close(); } diff --git a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java index d0145be97cd..f647c9b6c90 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java +++ b/dd-java-agent/instrumentation/vertx/vertx-sql-client-3.9/src/main/java/datadog/trace/instrumentation/vertx_sql_client_39/QueryAdvice.java @@ -5,10 +5,10 @@ import static datadog.trace.instrumentation.vertx_sql_client_39.VertxSqlClientDecorator.DECORATE; import datadog.context.ContextContinuation; +import datadog.context.ContextScope; import datadog.trace.api.Pair; 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 io.vertx.core.AsyncResult; import io.vertx.core.Handler; @@ -29,7 +29,7 @@ public static void afterCopy( public static class Execute { @Advice.OnMethodEnter(suppress = Throwable.class) - public static > AgentScope beforeExecute( + public static > ContextScope beforeExecute( @Advice.This final Query zis, @Advice.Argument( value = 0, @@ -62,7 +62,7 @@ public static > AgentScope beforeExecute( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void afterExecute( - @Advice.Thrown final Throwable throwable, @Advice.Enter final AgentScope clientScope) { + @Advice.Thrown final Throwable throwable, @Advice.Enter final ContextScope clientScope) { if (null != clientScope) { clientScope.close(); } 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 977bf45fc8f..b767a9cfa48 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -98,8 +98,8 @@ io.vertx:vertx-web:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTes javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -140,7 +140,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 975326a2c45..b8a103d3163 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -96,8 +96,8 @@ io.vertx:vertx-web:3.9.16=latestDepForkedTestCompileClasspath,latestDepForkedTes javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -138,7 +138,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 4818c514041..d8e335b6379 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -25,8 +25,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -76,8 +76,8 @@ io.vertx:vertx-web:3.9.0=compileClasspath,latestDepTestCompileClasspath,latestDe javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -118,7 +118,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 91bb5d0cdad..2576a227c29 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 @@ -2,105 +2,105 @@ # Manual edits can break the build 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 -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,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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=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.5=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.11.3=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=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 -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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +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.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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,latestDepTestAnnotationProcessor,latestDepTestCompileClasspath,testAnnotationProcessor,testCompileClasspath +com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +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.14.0=spotbugs -com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -com.google.errorprone:error_prone_annotations:2.47.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.18.0=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor +com.google.errorprone:error_prone_annotations:2.47.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.google.errorprone:error_prone_annotations:2.48.0=spotbugs -com.google.guava:failureaccess:1.0.1=annotationProcessor,latestDepForkedTestAnnotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor -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: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 -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,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: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 +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-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=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-io:commons-io:2.11.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath commons-io:commons-io:2.21.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.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +de.thetaphi:forbiddenapis:3.10=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.leangen.geantyref:geantyref:1.3.16=latestDepTestRuntimeClasspath,testRuntimeClasspath +io.netty:netty-buffer:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-buffer:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-socks:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-socks:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-common:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.81.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport-native-unix-common:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-transport:4.1.137.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.84.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.1.138.Final=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.1.49.Final=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath +io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-auth-common:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-auth-common:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-bridge-common:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-bridge-common:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.vertx:vertx-uri-template:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-uri-template:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-client:4.0.0=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-client:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-client:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-common:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-common:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-common:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web:4.0.0=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web:4.5.32=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +io.vertx:vertx-web:4.5.34=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs -junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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=latestDepTestRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs org.apache.ant:ant-antlr:1.10.14=codenarc org.apache.ant:ant-junit:1.10.14=codenarc @@ -109,59 +109,58 @@ org.apache.commons:commons-lang3:3.20.0=spotbugs org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=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=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=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +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=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +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=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.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 -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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs -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.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,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 +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.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.10.1=spotbugs -org.ow2.asm:asm-analysis:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm-commons:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath -org.ow2.asm:asm-tree:9.10.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm-commons:9.10.1=latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath +org.ow2.asm:asm-tree:9.10.1=latestDepTestRuntimeClasspath,spotbugs,testRuntimeClasspath org.ow2.asm:asm-util:9.10.1=spotbugs -org.ow2.asm:asm-util:9.7.1=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,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-util:9.7.1=latestDepTestRuntimeClasspath,testRuntimeClasspath +org.ow2.asm:asm:9.10.1=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,spotbugs,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=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:1.7.32=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.slf4j:slf4j-api:2.0.17=spotbugsSlf4j org.slf4j:slf4j-api:2.0.18=spotbugs org.slf4j:slf4j-simple:2.0.17=spotbugsSlf4j -org.snakeyaml:snakeyaml-engine:2.9=buildTimeInstrumentationPlugin,latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,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.2=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.tabletest:tabletest-parser:1.2.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +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.2=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tabletest:tabletest-parser:1.2.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.xmlresolver:xmlresolver:5.3.3=spotbugs empty=spotbugsPlugins,testArtifacts diff --git a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java index 5c617ce0275..8ce9f0e1255 100644 --- a/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java +++ b/dd-java-agent/instrumentation/vertx/vertx-web/vertx-web-4.0/src/main/java/datadog/trace/instrumentation/vertx_4_0/client/HttpClientRequestBaseInstrumentation.java @@ -11,9 +11,9 @@ import com.google.auto.service.AutoService; import datadog.context.Context; +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 datadog.trace.instrumentation.netty41.AttributeKeys; import io.vertx.core.http.impl.HttpClientStream; @@ -63,7 +63,7 @@ public static void onExit( stream.connection().channel().attr(AttributeKeys.CONTEXT_ATTRIBUTE_KEY).get(); AgentSpan nettySpan = spanFromContext(storedContext); if (nettySpan != null) { - try (final AgentScope scope = activateSpan(nettySpan)) { + try (final ContextScope scope = activateSpan(nettySpan)) { DECORATE.onError(scope, cause); } } 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 00ea799bb66..ba2d485530e 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 @@ -9,14 +9,14 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep 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-instrument-java:0.0.5=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 com.fasterxml.jackson.core:jackson-core:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson.core:jackson-core:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.21.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath com.fasterxml.jackson:jackson-bom:2.16.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -com.fasterxml.jackson:jackson-bom:2.21.5=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.21.6=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,62 +56,62 @@ commons-io:commons-io:2.21.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.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-buffer:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-base:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-base:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-classes-quic:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-base:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-classes-quic:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-compression:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-compression:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-compression:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-dns:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-dns:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http2:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http2:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-codec-http3:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http2:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http3:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-codec-http:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-codec-http:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-http:4.2.18.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.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-codec-socks:4.2.18.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.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-common:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler-proxy:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler-proxy:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler-proxy:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-handler:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-handler:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-handler:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver-dns:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver-dns:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver-dns:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-resolver:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-resolver:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.netty:netty-tcnative-classes:2.0.81.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-resolver:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-tcnative-classes:2.0.84.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.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport-native-unix-common:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.netty:netty-transport:4.2.0.RC1=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.netty:netty-transport:4.2.17.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.netty:netty-transport:4.2.18.Final=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.sqreen:libsqreen:17.5.0=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath io.vertx:vertx-auth-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-auth-common:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-auth-common:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-bridge-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-bridge-common:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-bridge-common:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core-logging:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core-logging:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core-logging:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-core:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-core:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath -io.vertx:vertx-eventbus-bridge-common:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-core:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-eventbus-bridge-common:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-uri-template:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-uri-template:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-uri-template:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-client:5.0.0.CR3=testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-client:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-client:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web-common:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web-common:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web-common:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath io.vertx:vertx-web:5.0.0.CR3=compileClasspath,testCompileClasspath,testRuntimeClasspath -io.vertx:vertx-web:5.1.6=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath +io.vertx:vertx-web:5.1.8=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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 net.sf.saxon:Saxon-HE:12.10=spotbugs diff --git a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile index d2ffe613ff2..180ae40e9e1 100644 --- a/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile +++ b/dd-java-agent/instrumentation/weaver-0.9/gradle.lockfile @@ -11,7 +11,7 @@ co.fs2:fs2-core_3:3.13.0=latestDepTestCompileClasspath,latestDepTestRuntimeClass com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath @@ -37,8 +37,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor,weaver084TestAnnotationProcessor @@ -75,8 +75,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,we javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath net.java.dev.jna:jna:5.8.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath net.minidev:accessors-smart:2.4.9=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath @@ -130,7 +130,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te org.junit.platform:junit-platform-suite-api:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath org.junit:junit-bom:5.14.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=latestDepTestRuntimeClasspath,testRuntimeClasspath,weaver084TestRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,weaver084TestCompileClasspath,weaver084TestRuntimeClasspath org.msgpack:msgpack-core:0.9.6=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 1c8a6e8c7a0..e56847cad66 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -63,8 +63,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:4.0.2=latestDepTestCompileClasspath,latest javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -123,7 +123,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 c9e9dc57e79..738cd6be863 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ javax.websocket:javax.websocket-api:1.0-rc1=compileClasspath javax.websocket:javax.websocket-client-api:1.0-rc1=compileClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -119,7 +119,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java index 575d7a8cded..31e17cfc779 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/AsyncRemoteEndpointInstrumentation.java @@ -10,10 +10,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.nio.ByteBuffer; @@ -78,7 +78,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class SendTextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Async self, @Advice.Argument(0) String text, @Advice.Argument( @@ -108,7 +108,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future future) { @@ -135,7 +135,7 @@ public static void after( public static class SendBinaryAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Async self, @Advice.Argument(0) ByteBuffer buffer, @Advice.Argument( @@ -165,7 +165,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future future) { @@ -192,7 +192,7 @@ public static void after( public static class SendObjectAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Async self, @Advice.Argument( value = 1, @@ -219,7 +219,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Return(readOnly = false, typing = Assigner.Typing.DYNAMIC) Future future) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java index 04c3fc1c8d6..f150e195d29 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/BasicRemoteEndpointInstrumentation.java @@ -12,10 +12,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import java.io.OutputStream; @@ -73,7 +73,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class SendTextAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Basic self, @Advice.Argument(0) String text, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { @@ -94,7 +94,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Argument(value = 1, optional = true) final Boolean last) { @@ -114,7 +114,7 @@ public static void after( public static class SendBinaryAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Basic self, @Advice.Argument(0) ByteBuffer buffer, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { @@ -135,7 +135,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Argument(value = 1, optional = true) final Boolean last) { @@ -154,7 +154,7 @@ public static void after( public static class SendObjectAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final RemoteEndpoint.Basic self, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { handlerContext = @@ -174,7 +174,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext, @Advice.Thrown final Throwable throwable) { CallDepthThreadLocalMap.decrementCallDepth(RemoteEndpoint.class); diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java index ef50904e530..d41ac1d07f6 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/EndpointInstrumentation.java @@ -3,15 +3,16 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.HierarchyMatchers.extendsClass; import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.bootstrap.instrumentation.decorator.WebsocketDecorator.DECORATE; import static net.bytebuddy.matcher.ElementMatchers.isPublic; import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.api.Config; import datadog.trace.bootstrap.InstrumentationContext; -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; @@ -76,7 +77,7 @@ public static void onEnter(@Advice.Argument(0) final Session session) { public static class SessionCloseAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext, @Advice.Argument(0) final Session session, @Advice.Argument(1) final CloseReason closeReason) { @@ -95,11 +96,11 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext, @Advice.Thrown final Throwable thrown) { if (scope != null) { - final AgentSpan span = scope.span(); + final AgentSpan span = spanFromScope(scope); DECORATE.onError(span, thrown); DECORATE.onFrameEnd(handlerContext); scope.close(); diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java index 846955c332c..ddb35680e95 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/MessageHandlerInstrumentation.java @@ -8,10 +8,10 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArgument; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.CallDepthThreadLocalMap; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import javax.websocket.MessageHandler; @@ -51,7 +51,7 @@ public void methodAdvice(MethodTransformer transformer) { public static class OnMessageAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope onEnter( + public static ContextScope onEnter( @Advice.This final MessageHandler handler, @Advice.Argument(value = 0, typing = Assigner.Typing.DYNAMIC) final Object data, @Advice.Argument(value = 1, optional = true) final Boolean last, @@ -73,7 +73,7 @@ public static AgentScope onEnter( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void onExit( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Local("handlerContext") HandlerContext.Receiver handlerContext, @Advice.Thrown final Throwable throwable, @Advice.Argument(value = 1, optional = true) final Boolean last) { diff --git a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java index b8ceed2f78d..b7cd90d7ea1 100644 --- a/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java +++ b/dd-java-agent/instrumentation/websocket/javax-websocket-1.0/src/main/java/datadog/trace/instrumentation/websocket/jsr256/SessionInstrumentation.java @@ -10,9 +10,9 @@ import static net.bytebuddy.matcher.ElementMatchers.takesArguments; import static net.bytebuddy.matcher.ElementMatchers.takesNoArguments; +import datadog.context.ContextScope; import datadog.trace.agent.tooling.Instrumenter; import datadog.trace.bootstrap.InstrumentationContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.websocket.HandlerContext; import javax.websocket.CloseReason; import javax.websocket.MessageHandler; @@ -147,7 +147,7 @@ public static void onExit( public static class SessionCloseAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final Session session, @Advice.Argument(0) final CloseReason reason, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { @@ -163,7 +163,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable thrown, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { if (scope != null) { @@ -176,7 +176,7 @@ public static void after( public static class DefaultSessionCloseAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope before( + public static ContextScope before( @Advice.This final Session session, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { @@ -190,7 +190,7 @@ public static AgentScope before( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void after( - @Advice.Enter final AgentScope scope, + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable thrown, @Advice.Local("handlerContext") HandlerContext.Sender handlerContext) { if (scope != null) { 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 4c7f9c82b2d..70e61244050 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=latestDepTestRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=latestDepTestRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,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.10.3=compileClasspath,main_java11CompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,main_java11CompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -58,8 +58,8 @@ jakarta.transaction:jakarta.transaction-api:1.3.3=latestDepTestCompileClasspath, javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,main_java11CompileClasspath,main_java11RuntimeClasspath,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.10=spotbugs @@ -143,7 +143,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 79816225dee..a31b7564e0a 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -59,8 +59,8 @@ jakarta.transaction:jakarta.transaction-api:2.0.0-RC1=testCompileClasspath,testR javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -144,7 +144,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 89f5fa14efd..39b06044ba8 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -68,8 +68,8 @@ jakarta.websocket:jakarta.websocket-client-api:2.1.1=latestDepTestCompileClasspa javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -198,7 +198,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 42f775ab4fa..daac4a9eab5 100644 --- a/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile +++ b/dd-java-agent/instrumentation/websphere-jmx-8.5/gradle.lockfile @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=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 af1845b7c7a..43a749383f1 100644 --- a/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/wildfly-9.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepForkedTestCompileClasspath,latestDep com.blogspot.mydailyjava:weak-lock-free:0.17=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -71,8 +71,8 @@ jakarta.servlet:jakarta.servlet-api:6.0.0=latestDepForkedTestCompileClasspath,la javax.servlet:javax.servlet-api:3.1.0=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=latestDepForkedTestRuntimeClasspath,latestDepTestRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,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 net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -179,7 +179,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepForkedTestRuntimeClassp 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.junit:junit-bom:5.14.1=latestDepForkedTestCompileClasspath,latestDepForkedTestRuntimeClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 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 3e1f68e3d4f..a9d40a6ce4b 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -56,8 +56,8 @@ jakarta.jws:jakarta.jws-api:3.0.0=compileClasspath,latestDepTestCompileClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java index aba631a4552..fbe061a13ab 100644 --- a/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jakarta-ws-annotations-3.0/src/main/java/datadog/trace/instrumentation/jakartaws/WebServiceInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jakartaws.WebServiceDecorator.DECORATE; import static datadog.trace.instrumentation.jakartaws.WebServiceDecorator.JAKARTA_WS_REQUEST; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; @@ -15,10 +16,10 @@ import static net.bytebuddy.matcher.ElementMatchers.not; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import jakarta.jws.WebService; import net.bytebuddy.asm.Advice; @@ -68,7 +69,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class InvokeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.This Object thiz, @Advice.Origin("#m") String method) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class); if (callDepth > 0) { @@ -84,14 +85,14 @@ public static AgentScope beginRequest( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { if (null == scope) { return; } CallDepthThreadLocalMap.reset(WebService.class); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } 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 0f7200b260c..ffe55e6778a 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 @@ -9,7 +9,7 @@ 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.4=buildTimeInstrumentationPlugin,compileClasspath,muzzleBootstrap,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 @@ -56,8 +56,8 @@ javax.jws:javax.jws-api:1.1=compileClasspath,testCompileClasspath,testRuntimeCla javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java index 68642dbcc30..416317891df 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-1.1/src/main/java/datadog/trace/instrumentation/jaxws1/WebServiceInstrumentation.java @@ -6,6 +6,7 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxws1.WebServiceDecorator.DECORATE; import static datadog.trace.instrumentation.jaxws1.WebServiceDecorator.JAX_WS_REQUEST; import static net.bytebuddy.matcher.ElementMatchers.isDeclaredBy; @@ -15,10 +16,10 @@ import static net.bytebuddy.matcher.ElementMatchers.not; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.jws.WebService; import net.bytebuddy.asm.Advice; @@ -68,7 +69,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class InvokeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.This Object thiz, @Advice.Origin("#m") String method) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebService.class); if (callDepth > 0) { @@ -84,14 +85,14 @@ public static AgentScope beginRequest( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { if (null == scope) { return; } CallDepthThreadLocalMap.reset(WebService.class); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } 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 abfe24e0039..10c625b9042 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 @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -22,8 +22,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -64,8 +64,8 @@ javax.xml.ws:jaxws-api:2.0=compileClasspath,testCompileClasspath,testRuntimeClas javax.xml.ws:jaxws-api:2.3.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.10=spotbugs @@ -106,7 +106,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java index c8241e54ee7..5e7d2f76842 100644 --- a/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java +++ b/dd-java-agent/instrumentation/ws/jax-ws/jax-ws-annotations-2.0/src/main/java/datadog/trace/instrumentation/jaxws2/WebServiceProviderInstrumentation.java @@ -5,16 +5,17 @@ import static datadog.trace.agent.tooling.bytebuddy.matcher.NameMatchers.named; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.activateSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.startSpan; +import static datadog.trace.bootstrap.instrumentation.api.Java8BytecodeBridge.spanFromScope; import static datadog.trace.instrumentation.jaxws2.WebServiceProviderDecorator.DECORATE; import static datadog.trace.instrumentation.jaxws2.WebServiceProviderDecorator.JAX_WS_REQUEST; import static net.bytebuddy.matcher.ElementMatchers.isMethod; import static net.bytebuddy.matcher.ElementMatchers.takesArguments; 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.CallDepthThreadLocalMap; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import javax.xml.ws.WebServiceProvider; import net.bytebuddy.asm.Advice; @@ -62,7 +63,7 @@ public void methodAdvice(MethodTransformer transformer) { public static final class InvokeAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope beginRequest( + public static ContextScope beginRequest( @Advice.This Object thiz, @Advice.Origin("#m") String method) { final int callDepth = CallDepthThreadLocalMap.incrementCallDepth(WebServiceProvider.class); if (callDepth > 0) { @@ -78,14 +79,14 @@ public static AgentScope beginRequest( @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void finishRequest( - @Advice.Enter final AgentScope scope, @Advice.Thrown final Throwable error) { + @Advice.Enter final ContextScope scope, @Advice.Thrown final Throwable error) { if (null == scope) { return; } CallDepthThreadLocalMap.reset(WebServiceProvider.class); - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (null != error) { DECORATE.onError(span, error); } 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 36df2182ba6..fe26ce7ee31 100644 --- a/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile +++ b/dd-java-agent/instrumentation/zio/zio-2.0/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=latestDepTestCompileClasspath,latestDepTestRu 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-instrument-java:0.0.5=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 @@ -26,8 +26,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=annotationProcessor,latestDepTestAnnotationProcessor,testAnnotationProcessor @@ -72,8 +72,8 @@ io.sqreen:libsqreen:17.5.0=latestDepTestRuntimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=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.bytebuddy:byte-buddy-agent:1.18.12=buildTimeInstrumentationPlugin,compileClasspath,latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,muzzleTooling,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=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.openhft:zero-allocation-hashing:0.16=zinc @@ -122,7 +122,6 @@ org.junit.platform:junit-platform-runner:1.14.1=latestDepTestRuntimeClasspath,te 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.1=latestDepTestCompileClasspath,latestDepTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-java-agent/load-generator/gradle.lockfile b/dd-java-agent/load-generator/gradle.lockfile index 49de372e46e..69c3cb2d1b7 100644 --- a/dd-java-agent/load-generator/gradle.lockfile +++ b/dd-java-agent/load-generator/gradle.lockfile @@ -19,8 +19,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -78,7 +78,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/testing/gradle.lockfile b/dd-java-agent/testing/gradle.lockfile index 1157e80027a..9f3fe6f77ff 100644 --- a/dd-java-agent/testing/gradle.lockfile +++ b/dd-java-agent/testing/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -100,7 +100,6 @@ org.junit.platform:junit-platform-runner:1.14.1=compileClasspath,runtimeClasspat org.junit.platform:junit-platform-suite-api:1.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy index db3fa988dd9..d022b7bab0d 100644 --- a/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy +++ b/dd-java-agent/testing/src/main/groovy/datadog/trace/agent/test/utils/TraceUtils.groovy @@ -1,7 +1,7 @@ package datadog.trace.agent.test.utils import datadog.trace.agent.test.asserts.TraceAssert -import datadog.trace.bootstrap.instrumentation.api.AgentScope +import datadog.context.ContextScope import datadog.trace.bootstrap.instrumentation.api.AgentSpan import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext import datadog.trace.bootstrap.instrumentation.decorator.BaseDecorator @@ -48,7 +48,7 @@ class TraceUtils { final AgentSpan span = inheritCurrent ? startSpan("test", rootOperationName) : startSpan("test", rootOperationName, (AgentSpanContext) null) DECORATOR.afterStart(span) - AgentScope scope = activateSpan(span) + ContextScope scope = activateSpan(span) try { return r.call() diff --git a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile index 7490e7b6099..ffca9a9f7cb 100644 --- a/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile +++ b/dd-smoke-tests/apm-tracing-disabled/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/gradle.lockfile b/dd-smoke-tests/appsec/gradle.lockfile index e2728201b88..dc486174fba 100644 --- a/dd-smoke-tests/appsec/gradle.lockfile +++ b/dd-smoke-tests/appsec/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -51,8 +51,8 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -94,7 +94,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile index 650c0a8c91d..947e7891ab6 100644 --- a/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile +++ b/dd-smoke-tests/appsec/spring-tomcat7/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,8 +53,8 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile index 3d05b1d8cdf..634d7995b80 100644 --- a/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-graphql/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -63,8 +63,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -112,7 +112,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile index 1562a04dd2e..367ecd0cca9 100644 --- a/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-grpc/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -51,8 +51,8 @@ io.leangen.geantyref:geantyref:1.3.16=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -94,7 +94,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile index 20eaa0cbe4b..3b10c9e8b16 100644 --- a/dd-smoke-tests/appsec/springboot-security/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot-security/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -66,8 +66,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=testCompileClasspath,testRuntimeClas javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.minidev:accessors-smart:1.2=testCompileClasspath,testRuntimeClasspath @@ -125,7 +125,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:3.9.0=testCompileClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.mockito:mockito-junit-jupiter:3.9.0=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/appsec/springboot/gradle.lockfile b/dd-smoke-tests/appsec/springboot/gradle.lockfile index 627150e58d6..475deb5bdcf 100644 --- a/dd-smoke-tests/appsec/springboot/gradle.lockfile +++ b/dd-smoke-tests/appsec/springboot/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.7=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -35,8 +35,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -72,8 +72,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -122,7 +122,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/armeria-grpc/gradle.lockfile b/dd-smoke-tests/armeria-grpc/gradle.lockfile index 459251b00cd..5a527252c82 100644 --- a/dd-smoke-tests/armeria-grpc/gradle.lockfile +++ b/dd-smoke-tests/armeria-grpc/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testCompileProtoPath,tes 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 -com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,compileProtoPath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=testRuntimeClasspath com.google.api.grpc:proto-google-common-protos:2.17.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -74,8 +74,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -122,7 +122,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testCompileProtoPath,testRuntime org.junit.platform:junit-platform-suite-api:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/backend-mock/gradle.lockfile b/dd-smoke-tests/backend-mock/gradle.lockfile index dfbdd1de3e3..279c2a35456 100644 --- a/dd-smoke-tests/backend-mock/gradle.lockfile +++ b/dd-smoke-tests/backend-mock/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.minidev:accessors-smart:2.4.9=runtimeClasspath,testRuntimeClasspath @@ -105,7 +105,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy b/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy index 4d864bf86cf..88224fb21c3 100644 --- a/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy +++ b/dd-smoke-tests/backend-mock/src/main/groovy/datadog/smoketest/MockBackend.groovy @@ -222,7 +222,7 @@ class MockBackend implements AutoCloseable { }, "name": "$test.name", "suite": "$test.suite", - "_missing_line_code_coverage": ${test.coverage == null} + "_is_missing_line_code_coverage": ${test.coverage == null} } } """) diff --git a/dd-smoke-tests/cli/gradle.lockfile b/dd-smoke-tests/cli/gradle.lockfile index a35d02ff98a..689e09d2718 100644 --- a/dd-smoke-tests/cli/gradle.lockfile +++ b/dd-smoke-tests/cli/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-21/gradle.lockfile b/dd-smoke-tests/concurrent/java-21/gradle.lockfile index cfddf7510cb..da774b83337 100644 --- a/dd-smoke-tests/concurrent/java-21/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-21/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-25/gradle.lockfile b/dd-smoke-tests/concurrent/java-25/gradle.lockfile index 59eb6747531..65ee4c56d03 100644 --- a/dd-smoke-tests/concurrent/java-25/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-25/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/concurrent/java-8/gradle.lockfile b/dd-smoke-tests/concurrent/java-8/gradle.lockfile index 0bc1f0510b5..5cba6d67c86 100644 --- a/dd-smoke-tests/concurrent/java-8/gradle.lockfile +++ b/dd-smoke-tests/concurrent/java-8/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/crashtracking/gradle.lockfile b/dd-smoke-tests/crashtracking/gradle.lockfile index 0be6b8f2837..39988afa0f1 100644 --- a/dd-smoke-tests/crashtracking/gradle.lockfile +++ b/dd-smoke-tests/crashtracking/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,8 +53,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/custom-systemloader/gradle.lockfile b/dd-smoke-tests/custom-systemloader/gradle.lockfile index 4061859f6ed..19a5d053350 100644 --- a/dd-smoke-tests/custom-systemloader/gradle.lockfile +++ b/dd-smoke-tests/custom-systemloader/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,8 +53,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.ws.rs:javax.ws.rs-api:2.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -96,7 +96,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile b/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile index 8ebd7f82c4e..659d170f01f 100644 --- a/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile +++ b/dd-smoke-tests/datastreams/kafkaschemaregistry/gradle.lockfile @@ -13,8 +13,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.code.findbugs:jsr305:3.0.2=compileClasspath,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -94,7 +94,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=runtimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile index 63b23692ce4..128d5a39f8e 100644 --- a/dd-smoke-tests/debugger-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/debugger-integration-tests/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -63,8 +63,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.12=compileClasspath,runtimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -111,7 +111,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/dynamic-config/gradle.lockfile b/dd-smoke-tests/dynamic-config/gradle.lockfile index 3e6a56313ee..6ae75dc8292 100644 --- a/dd-smoke-tests/dynamic-config/gradle.lockfile +++ b/dd-smoke-tests/dynamic-config/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/field-injection/gradle.lockfile b/dd-smoke-tests/field-injection/gradle.lockfile index 6da937b17f5..82577d70918 100644 --- a/dd-smoke-tests/field-injection/gradle.lockfile +++ b/dd-smoke-tests/field-injection/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle.lockfile b/dd-smoke-tests/gradle.lockfile index 045b7f22842..5ddd4b7b589 100644 --- a/dd-smoke-tests/gradle.lockfile +++ b/dd-smoke-tests/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/gradle.lockfile b/dd-smoke-tests/gradle/gradle.lockfile index 119a10b6f43..6cc48188526 100644 --- a/dd-smoke-tests/gradle/gradle.lockfile +++ b/dd-smoke-tests/gradle/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testRuntimeClasspath net.minidev:accessors-smart:2.4.9=testRuntimeClasspath @@ -105,7 +105,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java index 37cd8c8a99c..84b6f6a4ae8 100644 --- a/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java +++ b/dd-smoke-tests/gradle/src/test/java/datadog/smoketest/GradleDaemonSmokeTest.java @@ -144,14 +144,20 @@ void testNew( } @TableTest({ - "scenario | gradleVersion | projectName | expectedTraces", - "robolectric-latest | latest | test-succeed-robolectric | 7 " + "scenario | gradleVersion | robolectricVersion | expectedVersion | projectName | expectedTraces", + "robolectric-4.16 | latest | 4.16.1 | 4.16.1 | test-succeed-robolectric | 7 ", + "robolectric-latest | latest | + | any | test-succeed-robolectric | 7 " }) @ParameterizedTest - void testRobolectric(String gradleVersion, String projectName, int expectedTraces) + void testRobolectric( + String gradleVersion, + String robolectricVersion, + String expectedVersion, + String projectName, + int expectedTraces) throws IOException { Assumptions.assumeTrue( - JavaVirtualMachine.isJavaVersionBetween(17, 22), "Robolectric 4.16 supports JDK 17-21"); + JavaVirtualMachine.isJavaVersionBetween(17, 22), "Robolectric supports JDK 17-21"); Assumptions.assumeFalse( OperatingSystem.architecture().isArm64(), "Robolectric does not support arm64 (missing native runtime binaries, follow https://github.com/robolectric/robolectric/issues/9166)"); @@ -163,15 +169,43 @@ void testRobolectric(String gradleVersion, String projectName, int expectedTrace givenGradleProjectProperties(); ensureDependenciesDownloaded(gradleVersion); - BuildResult buildResult = runGradleTests(gradleVersion, true, false); + Map additionalEnvVars = + Collections.singletonMap("SMOKE_TEST_ROBOLECTRIC_VERSION", robolectricVersion); + BuildResult buildResult = runGradleTests(gradleVersion, true, false, additionalEnvVars); assertBuildSuccessful(buildResult); + List> events = mockBackend.waitForEvents(expectedTraces); + assertRobolectricVersion(events, expectedVersion); verifyEventsAndCoverages( projectName, "gradle", gradleVersion, - mockBackend.waitForEvents(expectedTraces), - mockBackend.waitForCoverages(0)); + events, + mockBackend.waitForCoverages(0), + Collections.singletonList("content.meta.['test.android.robolectric.version']")); + } + + private static void assertRobolectricVersion( + List> events, String expectedVersion) { + int taggedEvents = 0; + for (Map event : events) { + Object content = event.get("content"); + if (!(content instanceof Map)) { + continue; + } + Object meta = ((Map) content).get("meta"); + if (!(meta instanceof Map)) { + continue; + } + Object version = ((Map) meta).get("test.android.robolectric.version"); + if (version != null) { + if (!"any".equals(expectedVersion)) { + assertEquals(expectedVersion, version); + } + taggedEvents++; + } + } + assertEquals(2, taggedEvents); } @TableTest({ @@ -371,6 +405,16 @@ private void givenGradleProjectProperties(Map additionalArgs) th private BuildResult runGradleTests( String gradleVersion, boolean successExpected, boolean configurationCache) throws IOException { + return runGradleTests( + gradleVersion, successExpected, configurationCache, Collections.emptyMap()); + } + + private BuildResult runGradleTests( + String gradleVersion, + boolean successExpected, + boolean configurationCache, + Map additionalEnvVars) + throws IOException { List arguments = new java.util.ArrayList<>(Arrays.asList("test", "--stacktrace")); if (gradleVersion.compareTo("4.5") > 0) { // warning mode available starting from Gradle 4.5 @@ -379,7 +423,7 @@ private BuildResult runGradleTests( if (configurationCache) { arguments.addAll(Arrays.asList("--configuration-cache", "--rerun-tasks")); } - return runGradle(gradleVersion, arguments, successExpected); + return runGradle(gradleVersion, arguments, successExpected, additionalEnvVars); } /** @@ -417,6 +461,15 @@ private void ensureDependenciesDownloaded(String gradleVersion) { private BuildResult runGradle( String gradleVersion, List arguments, boolean successExpected) throws IOException { + return runGradle(gradleVersion, arguments, successExpected, Collections.emptyMap()); + } + + private BuildResult runGradle( + String gradleVersion, + List arguments, + boolean successExpected, + Map additionalEnvVars) + throws IOException { Map buildEnv = new HashMap<>(); buildEnv.put("GRADLE_ARGS", ""); buildEnv.put("GRADLE_OPTS", ""); @@ -425,6 +478,7 @@ private BuildResult runGradle( buildEnv.put( GradleDistribution.GRADLE_DISTRIBUTION_URL_ENV, GradleDistribution.uriFor(gradleVersion).toString()); + buildEnv.putAll(additionalEnvVars); String mavenRepositoryProxy = System.getenv("MAVEN_REPOSITORY_PROXY"); if (mavenRepositoryProxy != null) { diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/build.gradleTest b/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/build.gradleTest index 566eba49ada..99f5d4d702e 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/build.gradleTest +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/build.gradleTest @@ -96,7 +96,7 @@ configurations.configureEach { dependencies { testImplementation 'junit:junit:4.13.2' - testImplementation 'org.robolectric:robolectric:4.16.1' + testImplementation "org.robolectric:robolectric:${System.getenv('SMOKE_TEST_ROBOLECTRIC_VERSION')}" // Pre-built Android SDK jar for the level the fixtures configure. testImplementation 'org.robolectric:android-all:14-robolectric-10818077' // androidx.test:core pulls in androidx.test:monitor (InstrumentationRegistry); ext:junit provides diff --git a/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/events.ftl b/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/events.ftl index b08072b29ab..d0d7ed7d09d 100644 --- a/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/events.ftl +++ b/dd-smoke-tests/gradle/src/test/resources/test-succeed-robolectric/events.ftl @@ -387,9 +387,9 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", - "test.android.codename" : "U", + "test.android.codename" : "UPSIDE_DOWN_CAKE", "test.android.release" : "14", - "test.android.robolectric.version" : "4.16.1", + "test.android.robolectric.version" : ${content_meta_test_android_robolectric_version}, "test.final_status" : "pass", "test.framework" : "junit4", "test.framework_version" : "4.13.2", @@ -505,9 +505,9 @@ "runtime.vendor" : ${content_meta_runtime_vendor}, "runtime.version" : ${content_meta_runtime_version}, "span.kind" : "test", - "test.android.codename" : "U", + "test.android.codename" : "UPSIDE_DOWN_CAKE", "test.android.release" : "14", - "test.android.robolectric.version" : "4.16.1", + "test.android.robolectric.version" : ${content_meta_test_android_robolectric_version}, "test.final_status" : "pass", "test.framework" : "junit4", "test.framework_version" : "4.13.2", @@ -688,4 +688,4 @@ }, "type" : "span", "version" : 1 -} ] \ No newline at end of file +} ] diff --git a/dd-smoke-tests/grpc-1.5/gradle.lockfile b/dd-smoke-tests/grpc-1.5/gradle.lockfile index df8d2a77c93..ca6232cff91 100644 --- a/dd-smoke-tests/grpc-1.5/gradle.lockfile +++ b/dd-smoke-tests/grpc-1.5/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testCompileProtoPath,tes 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 -com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,compileProtoPath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.api.grpc:proto-google-common-protos:2.22.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -113,8 +113,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testCompileProtoPath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testFixturesCompileProtoPath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -166,7 +166,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testCompileProtoPath,testRuntime org.junit.platform:junit-platform-suite-api:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-propagation/gradle.lockfile b/dd-smoke-tests/iast-propagation/gradle.lockfile index 26433aeaafd..bd9a9216aa4 100644 --- a/dd-smoke-tests/iast-propagation/gradle.lockfile +++ b/dd-smoke-tests/iast-propagation/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.5=compileClasspath,implementationDependenciesMet com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testRuntimeClasspath @@ -38,8 +38,8 @@ 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.10.3=compileClasspath,compileOnlyDependenciesMetadata,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileOnlyDependenciesMetadata,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.code.gson:gson:2.14.0=spotbugs @@ -72,8 +72,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath net.openhft:zero-allocation-hashing:0.16=zinc @@ -149,7 +149,6 @@ 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.1=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testImplementationDependenciesMetadata,testRuntimeClasspath diff --git a/dd-smoke-tests/iast-util/gradle.lockfile b/dd-smoke-tests/iast-util/gradle.lockfile index 456f103ed0c..690c4914ff9 100644 --- a/dd-smoke-tests/iast-util/gradle.lockfile +++ b/dd-smoke-tests/iast-util/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.10=compileClasspath @@ -66,8 +66,8 @@ javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testComp javax.validation:validation-api:1.1.0.Final=compileClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -125,7 +125,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesCompileClasspath,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 0cb54b54c3e..70e3c6bccb7 100644 --- a/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-11/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -32,8 +32,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -64,8 +64,8 @@ jakarta.validation:jakarta.validation-api:2.0.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -117,7 +117,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesCompileClasspath,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 8a3ad887fdb..d13092318f1 100644 --- a/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile +++ b/dd-smoke-tests/iast-util/iast-util-17/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -65,8 +65,8 @@ jakarta.validation:jakarta.validation-api:2.0.1=compileClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -118,7 +118,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testFixturesCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/java9-modules/gradle.lockfile b/dd-smoke-tests/java9-modules/gradle.lockfile index 6954ee3f929..f9f1de9bbec 100644 --- a/dd-smoke-tests/java9-modules/gradle.lockfile +++ b/dd-smoke-tests/java9-modules/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jboss-modules/gradle.lockfile b/dd-smoke-tests/jboss-modules/gradle.lockfile index 244d1e75e67..4fcc6829d45 100644 --- a/dd-smoke-tests/jboss-modules/gradle.lockfile +++ b/dd-smoke-tests/jboss-modules/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -102,7 +102,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile index 8243c2e88c5..2226adce8af 100644 --- a/dd-smoke-tests/jdk-tool-abort/gradle.lockfile +++ b/dd-smoke-tests/jdk-tool-abort/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-2/gradle.lockfile b/dd-smoke-tests/jersey-2/gradle.lockfile index efbf995ca47..d96557f3df5 100644 --- a/dd-smoke-tests/jersey-2/gradle.lockfile +++ b/dd-smoke-tests/jersey-2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -64,8 +64,8 @@ javax.xml.stream:stax-api:1.0-2=compileClasspath,runtimeClasspath,testCompileCla javax.xml:jaxb-api:2.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -131,7 +131,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/jersey-3/gradle.lockfile b/dd-smoke-tests/jersey-3/gradle.lockfile index bbd500bd773..a755758909b 100644 --- a/dd-smoke-tests/jersey-3/gradle.lockfile +++ b/dd-smoke-tests/jersey-3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -66,8 +66,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -128,7 +128,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/junit-console/gradle.lockfile b/dd-smoke-tests/junit-console/gradle.lockfile index d6826a3522d..3a7d0db0b30 100644 --- a/dd-smoke-tests/junit-console/gradle.lockfile +++ b/dd-smoke-tests/junit-console/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testRuntimeClasspath net.minidev:accessors-smart:2.4.9=testRuntimeClasspath @@ -106,7 +106,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-2/gradle.lockfile b/dd-smoke-tests/kafka-2/gradle.lockfile index 581ac0e8599..2ebc7b52db7 100644 --- a/dd-smoke-tests/kafka-2/gradle.lockfile +++ b/dd-smoke-tests/kafka-2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -77,8 +77,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=testRuntimeClasspath @@ -136,7 +136,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/kafka-3/gradle.lockfile b/dd-smoke-tests/kafka-3/gradle.lockfile index 7b9c7043f7c..87604ceddee 100644 --- a/dd-smoke-tests/kafka-3/gradle.lockfile +++ b/dd-smoke-tests/kafka-3/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -77,8 +77,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=runtimeClasspath,testFixturesRuntimeClasspat javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.jopt-simple:jopt-simple:5.0.4=testRuntimeClasspath @@ -137,7 +137,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/lib-injection/gradle.lockfile b/dd-smoke-tests/lib-injection/gradle.lockfile index e57421e9ccb..401e739207e 100644 --- a/dd-smoke-tests/lib-injection/gradle.lockfile +++ b/dd-smoke-tests/lib-injection/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -54,8 +54,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -97,7 +97,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/log-injection/gradle.lockfile b/dd-smoke-tests/log-injection/gradle.lockfile index 4d667d27336..c104126a284 100644 --- a/dd-smoke-tests/log-injection/gradle.lockfile +++ b/dd-smoke-tests/log-injection/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.3=logbackBackendLatest com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -76,8 +76,8 @@ jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath log4j:log4j:1.2.17=compileClasspath,log4j1Latest,slf4jLog4j1Bridge log4j:log4j:1.2.7=log4j1 -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.logstash.logback:logstash-logback-encoder:3.0=logbackBackend @@ -144,7 +144,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/maven/gradle.lockfile b/dd-smoke-tests/maven/gradle.lockfile index bf6226a795b..7741baeeeef 100644 --- a/dd-smoke-tests/maven/gradle.lockfile +++ b/dd-smoke-tests/maven/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,8 +57,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testRuntimeClasspath net.minidev:accessors-smart:2.4.9=testRuntimeClasspath @@ -106,7 +106,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.9.6=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.9.6=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/openfeature/gradle.lockfile b/dd-smoke-tests/openfeature/gradle.lockfile index 2343b4b58c8..d47ad8b4667 100644 --- a/dd-smoke-tests/openfeature/gradle.lockfile +++ b/dd-smoke-tests/openfeature/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentelemetry/gradle.lockfile b/dd-smoke-tests/opentelemetry/gradle.lockfile index 38cb5960b27..9ea65e47f58 100644 --- a/dd-smoke-tests/opentelemetry/gradle.lockfile +++ b/dd-smoke-tests/opentelemetry/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -98,7 +98,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/opentracing/gradle.lockfile b/dd-smoke-tests/opentracing/gradle.lockfile index 53e454db357..9bf01dabcc5 100644 --- a/dd-smoke-tests/opentracing/gradle.lockfile +++ b/dd-smoke-tests/opentracing/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -99,7 +99,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/osgi/gradle.lockfile b/dd-smoke-tests/osgi/gradle.lockfile index 94f434aea45..3fb509385e7 100644 --- a/dd-smoke-tests/osgi/gradle.lockfile +++ b/dd-smoke-tests/osgi/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -106,7 +106,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.knopflerfish.kf6:framework:8.0.11=knopflerfish org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.4/gradle.lockfile b/dd-smoke-tests/play-2.4/gradle.lockfile index c44e04476da..87dac51c13e 100644 --- a/dd-smoke-tests/play-2.4/gradle.lockfile +++ b/dd-smoke-tests/play-2.4/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:2.0.3=runtimeClasspath @@ -120,8 +120,8 @@ javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClass jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.8.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.jodah:typetools:0.4.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -184,7 +184,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.5/gradle.lockfile b/dd-smoke-tests/play-2.5/gradle.lockfile index 861d5457eb7..8879699dc13 100644 --- a/dd-smoke-tests/play-2.5/gradle.lockfile +++ b/dd-smoke-tests/play-2.5/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.1=runtimeClasspath @@ -132,8 +132,8 @@ javax.xml.bind:jaxb-api:2.3.1=compileClasspath,runtimeClasspath,testCompileClass jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.6=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.jodah:typetools:0.4.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -201,7 +201,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.6/gradle.lockfile b/dd-smoke-tests/play-2.6/gradle.lockfile index 5aa4300e486..82304bf4120 100644 --- a/dd-smoke-tests/play-2.6/gradle.lockfile +++ b/dd-smoke-tests/play-2.6/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler,play,runtimeClasspath com.google.code.findbugs:jsr305:3.0.2=compileClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -147,8 +147,8 @@ javax.xml.bind:jaxb-api:2.3.1=compileClasspath,play,runtimeClasspath,testCompile jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.9.9=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.jodah:typetools:0.5.0=compileClasspath,play @@ -207,7 +207,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.7/gradle.lockfile b/dd-smoke-tests/play-2.7/gradle.lockfile index c32c90713c3..3c03cf2779c 100644 --- a/dd-smoke-tests/play-2.7/gradle.lockfile +++ b/dd-smoke-tests/play-2.7/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -40,8 +40,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -145,8 +145,8 @@ javax.xml.bind:jaxb-api:2.3.1=compileClasspath,play,runtimeClasspath,testCompile jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.1=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.3.1=twirlCompiler @@ -206,7 +206,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 744deb8fca9..46fa87fbd63 100644 --- a/dd-smoke-tests/play-2.8-otel/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-otel/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -43,8 +43,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -147,8 +147,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.5=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.3.1=twirlCompiler @@ -204,7 +204,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=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 f8993cfce4b..7bb64209856 100644 --- a/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile +++ b/dd-smoke-tests/play-2.8-split-routes/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -43,8 +43,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -147,8 +147,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.5=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.3.1=twirlCompiler @@ -204,7 +204,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/play-2.8/gradle.lockfile b/dd-smoke-tests/play-2.8/gradle.lockfile index e0f7f6d5efb..1774234aa81 100644 --- a/dd-smoke-tests/play-2.8/gradle.lockfile +++ b/dd-smoke-tests/play-2.8/gradle.lockfile @@ -13,7 +13,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -43,8 +43,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:1.3.9=javaScriptCompiler com.google.code.findbugs:jsr305:3.0.2=compileClasspath,play,runtimeClasspath,spotbugs,testCompileClasspath,testRuntimeClasspath @@ -151,8 +151,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs joda-time:joda-time:2.10.5=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.3.1=twirlCompiler @@ -210,7 +210,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.8.0=compileClasspath,play,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile index 39845f426da..3661bc6bd39 100644 --- a/dd-smoke-tests/profiling-integration-tests/gradle.lockfile +++ b/dd-smoke-tests/profiling-integration-tests/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -30,8 +30,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -62,8 +62,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -107,7 +107,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=testCompileClasspath,testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus-native/gradle.lockfile b/dd-smoke-tests/quarkus-native/gradle.lockfile index f7c9597c906..52d528bdcb6 100644 --- a/dd-smoke-tests/quarkus-native/gradle.lockfile +++ b/dd-smoke-tests/quarkus-native/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/quarkus/gradle.lockfile b/dd-smoke-tests/quarkus/gradle.lockfile index 751b88818fd..04eac1989a9 100644 --- a/dd-smoke-tests/quarkus/gradle.lockfile +++ b/dd-smoke-tests/quarkus/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/ratpack-1.5/gradle.lockfile b/dd-smoke-tests/ratpack-1.5/gradle.lockfile index 1a724e8d6fc..41907586182 100644 --- a/dd-smoke-tests/ratpack-1.5/gradle.lockfile +++ b/dd-smoke-tests/ratpack-1.5/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -72,8 +72,8 @@ io.ratpack:ratpack-exec:1.5.0=compileClasspath,runtimeClasspath,testCompileClass javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -116,7 +116,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/resteasy/gradle.lockfile b/dd-smoke-tests/resteasy/gradle.lockfile index 9822661ca77..b7a7ba104b7 100644 --- a/dd-smoke-tests/resteasy/gradle.lockfile +++ b/dd-smoke-tests/resteasy/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -32,8 +32,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -73,8 +73,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.jcip:jcip-annotations:1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -136,7 +136,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.staxex:stax-ex:1.8.1=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath diff --git a/dd-smoke-tests/rum/gradle.lockfile b/dd-smoke-tests/rum/gradle.lockfile index 3fffa56cfdf..ad94b083dee 100644 --- a/dd-smoke-tests/rum/gradle.lockfile +++ b/dd-smoke-tests/rum/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=runtimeClasspath,testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testRuntimeClas org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile index fc1d3d7b909..54ba2497fd9 100644 --- a/dd-smoke-tests/rum/tomcat-10/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-10/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,8 +53,8 @@ jakarta.servlet:jakarta.servlet-api:5.0.0=compileClasspath,runtimeClasspath,test javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile index 90b1edbbbad..8452855bae1 100644 --- a/dd-smoke-tests/rum/tomcat-11/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-11/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,8 +53,8 @@ jakarta.servlet:jakarta.servlet-api:6.0.0=compileClasspath,runtimeClasspath,test javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile index 541218f2475..1fd9b6e9535 100644 --- a/dd-smoke-tests/rum/tomcat-9/gradle.lockfile +++ b/dd-smoke-tests/rum/tomcat-9/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:4.0.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile index f831edfa53e..ab7c7eb3643 100644 --- a/dd-smoke-tests/rum/wildfly-15/gradle.lockfile +++ b/dd-smoke-tests/rum/wildfly-15/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/sample-trace/gradle.lockfile b/dd-smoke-tests/sample-trace/gradle.lockfile index b0fa3501491..11400b8216c 100644 --- a/dd-smoke-tests/sample-trace/gradle.lockfile +++ b/dd-smoke-tests/sample-trace/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 cd6bb688288..4894511cee0 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 @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -62,8 +62,8 @@ jakarta.websocket:jakarta.websocket-api:1.1.2=compileClasspath,runtimeClasspath, javax.servlet:javax.servlet-api:4.0.1=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -131,7 +131,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 10e2f3e3e5d..139f97f5357 100644 --- a/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.4-webflux/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -77,8 +77,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -122,7 +122,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 88fe5f95967..9bda247069e 100644 --- a/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.5-webflux/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -79,8 +79,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -124,7 +124,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 b830850fd80..8a9d5a227e0 100644 --- a/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webflux/gradle.lockfile @@ -12,7 +12,7 @@ ch.qos.logback:logback-core:1.2.7=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -36,8 +36,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -98,9 +98,9 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,te javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath net.bytebuddy:byte-buddy:1.11.20=compileClasspath,runtimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -151,7 +151,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=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 dfd721d798c..583911daab0 100644 --- a/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.6-webmvc/gradle.lockfile @@ -10,7 +10,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -84,8 +84,8 @@ jakarta.xml.bind:jakarta.xml.bind-api:2.3.3=compileClasspath,runtimeClasspath,te javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -148,7 +148,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.jvnet.staxex:stax-ex:1.8=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,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 dfa4cd015d3..c9f5ec80bc9 100644 --- a/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-2.7-webflux/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 81fb30dbd3e..b714d325e0a 100644 --- a/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-native/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.lz4:lz4-java:1.7.1=testCompileClasspath,testRuntimeClasspath org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=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 37533835d87..2c3e11cce15 100644 --- a/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webflux/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 dab902e2544..457bfb1acbc 100644 --- a/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.0-webmvc/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 6438e730838..c05f60cdf08 100644 --- a/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-3.3-webmvc/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile index c24e187449e..17870aa50c1 100644 --- a/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile +++ b/dd-smoke-tests/spring-boot-rabbit/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.5=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -34,8 +34,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -62,8 +62,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -110,7 +110,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/spring-security/gradle.lockfile b/dd-smoke-tests/spring-security/gradle.lockfile index 29abebe4d70..dadf1e1462c 100644 --- a/dd-smoke-tests/spring-security/gradle.lockfile +++ b/dd-smoke-tests/spring-security/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=compileClasspath,runtimeClasspath,testCompile com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -32,8 +32,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.code.gson:gson:2.14.0=spotbugs @@ -65,8 +65,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=runtimeClasspath,testFixturesRuntimeClasspat javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -115,7 +115,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-freemarker/gradle.lockfile b/dd-smoke-tests/springboot-freemarker/gradle.lockfile index 36f90ce17e7..f6e443da08f 100644 --- a/dd-smoke-tests/springboot-freemarker/gradle.lockfile +++ b/dd-smoke-tests/springboot-freemarker/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-grpc/gradle.lockfile b/dd-smoke-tests/springboot-grpc/gradle.lockfile index c44df02478b..4ef3a715712 100644 --- a/dd-smoke-tests/springboot-grpc/gradle.lockfile +++ b/dd-smoke-tests/springboot-grpc/gradle.lockfile @@ -6,13 +6,12 @@ cafe.cryptography:curve25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeCla cafe.cryptography:ed25519-elisabeth:0.1.0=testCompileProtoPath,testRuntimeClasspath ch.qos.logback:logback-classic:1.1.11=compileClasspath,compileProtoPath,runtimeClasspath 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.1.11=compileClasspath,compileProtoPath,runtimeClasspath ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -ch.qos.logback:logback-core:1.6.3=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 -com.datadoghq:dd-instrument-java:0.0.4=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=testCompileProtoPath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=testCompileProtoPath,testRuntimeClasspath @@ -33,8 +32,8 @@ 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.10.3=compileClasspath,compileProtoPath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,compileProtoPath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.android:annotations:4.1.1.4=compileProtoPath,runtimeClasspath,testCompileProtoPath,testRuntimeClasspath com.google.api.grpc:grpc-google-cloud-spanner-admin-database-v1:1.61.0=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath @@ -108,8 +107,8 @@ javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testCompileProtoPath, javax.validation:validation-api:1.1.0.Final=compileClasspath,compileProtoPath,runtimeClasspath,testCompileClasspath,testCompileProtoPath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testCompileProtoPath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -164,7 +163,6 @@ org.junit.platform:junit-platform-runner:1.14.1=testCompileProtoPath,testRuntime org.junit.platform:junit-platform-suite-api:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=testCompileProtoPath,testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=compileProtoPath,spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testCompileProtoPath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testCompileProtoPath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-11/gradle.lockfile b/dd-smoke-tests/springboot-java-11/gradle.lockfile index c6e624cd7d3..179d452a0e9 100644 --- a/dd-smoke-tests/springboot-java-11/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-11/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-java-17/gradle.lockfile b/dd-smoke-tests/springboot-java-17/gradle.lockfile index 88ae5f8c1fc..765ab0b547a 100644 --- a/dd-smoke-tests/springboot-java-17/gradle.lockfile +++ b/dd-smoke-tests/springboot-java-17/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -27,8 +27,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,8 +57,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -102,7 +102,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile index 5a97fe11fcd..bd36196f440 100644 --- a/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-jetty-jsp/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-jpa/gradle.lockfile b/dd-smoke-tests/springboot-jpa/gradle.lockfile index 82dbf5386fb..5d5d0520221 100644 --- a/dd-smoke-tests/springboot-jpa/gradle.lockfile +++ b/dd-smoke-tests/springboot-jpa/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-mongo/gradle.lockfile b/dd-smoke-tests/springboot-mongo/gradle.lockfile index 0a37510dc7d..252591e4a1d 100644 --- a/dd-smoke-tests/springboot-mongo/gradle.lockfile +++ b/dd-smoke-tests/springboot-mongo/gradle.lockfile @@ -11,7 +11,7 @@ ch.qos.logback:logback-core:1.2.3=compileClasspath,runtimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -33,8 +33,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -60,8 +60,8 @@ jakarta.annotation:jakarta.annotation-api:1.3.5=compileClasspath,runtimeClasspat javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -108,7 +108,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.mongodb:bson:4.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.mongodb:mongodb-driver-core:4.1.1=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile index b9d13913392..3cc310987a5 100644 --- a/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-20/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile index 3a4a70aaa2b..d206f862af7 100644 --- a/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile +++ b/dd-smoke-tests/springboot-openliberty-23/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile index 7d7f23154d6..0039132ce9c 100644 --- a/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile +++ b/dd-smoke-tests/springboot-thymeleaf/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile index fc9026011b2..48acfa04fcf 100644 --- a/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat-jsp/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-tomcat/build.gradle b/dd-smoke-tests/springboot-tomcat/build.gradle index abb372de532..0560b211925 100644 --- a/dd-smoke-tests/springboot-tomcat/build.gradle +++ b/dd-smoke-tests/springboot-tomcat/build.gradle @@ -13,7 +13,7 @@ def serverExtension = 'zip' repositories { ivy { - url = mass.artifactUrl('dlcdn.apache.org') + url = mass.artifactUrl('archive.apache.org/dist') content { includeGroup serverName } diff --git a/dd-smoke-tests/springboot-tomcat/gradle.lockfile b/dd-smoke-tests/springboot-tomcat/gradle.lockfile index 5635ae9d432..37e21cc5115 100644 --- a/dd-smoke-tests/springboot-tomcat/gradle.lockfile +++ b/dd-smoke-tests/springboot-tomcat/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot-velocity/gradle.lockfile b/dd-smoke-tests/springboot-velocity/gradle.lockfile index 27d3a090bbd..082609a814b 100644 --- a/dd-smoke-tests/springboot-velocity/gradle.lockfile +++ b/dd-smoke-tests/springboot-velocity/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/springboot/gradle.lockfile b/dd-smoke-tests/springboot/gradle.lockfile index bace50ffa72..4e7a9a25519 100644 --- a/dd-smoke-tests/springboot/gradle.lockfile +++ b/dd-smoke-tests/springboot/gradle.lockfile @@ -11,7 +11,7 @@ com.auth0:jwks-rsa:0.21.1=compileClasspath,runtimeClasspath,testCompileClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.4=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -35,8 +35,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.code.gson:gson:2.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath @@ -73,8 +73,8 @@ javax.servlet:javax.servlet-api:3.1.0=compileClasspath,runtimeClasspath,testComp javax.validation:validation-api:1.1.0.Final=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.java.dev.jna:jna:5.13.0=compileClasspath,runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -132,7 +132,6 @@ org.junit.platform:junit-platform-runner:1.14.1=runtimeClasspath,testFixturesRun org.junit.platform:junit-platform-suite-api:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=runtimeClasspath,testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=runtimeClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/tracer-flare/gradle.lockfile b/dd-smoke-tests/tracer-flare/gradle.lockfile index 091042a469d..665322d6c1c 100644 --- a/dd-smoke-tests/tracer-flare/gradle.lockfile +++ b/dd-smoke-tests/tracer-flare/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.4/gradle.lockfile b/dd-smoke-tests/vertx-3.4/gradle.lockfile index d541f4c7941..65b4a04bb4a 100644 --- a/dd-smoke-tests/vertx-3.4/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.4/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=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 e347e86eca9..7dd240dc5a5 100644 --- a/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9-resteasy/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-3.9/gradle.lockfile b/dd-smoke-tests/vertx-3.9/gradle.lockfile index 4c4fedbb98b..acbefe6de13 100644 --- a/dd-smoke-tests/vertx-3.9/gradle.lockfile +++ b/dd-smoke-tests/vertx-3.9/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -56,8 +56,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -101,7 +101,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/vertx-4.2/gradle.lockfile b/dd-smoke-tests/vertx-4.2/gradle.lockfile index 3d047c3ce4a..d79406d94d0 100644 --- a/dd-smoke-tests/vertx-4.2/gradle.lockfile +++ b/dd-smoke-tests/vertx-4.2/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,8 +55,8 @@ jakarta.mail:jakarta.mail-api:2.0.1=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/websphere-jmx/gradle.lockfile b/dd-smoke-tests/websphere-jmx/gradle.lockfile index 16eee57cb06..e5067455c4e 100644 --- a/dd-smoke-tests/websphere-jmx/gradle.lockfile +++ b/dd-smoke-tests/websphere-jmx/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-smoke-tests/wildfly/gradle.lockfile b/dd-smoke-tests/wildfly/gradle.lockfile index d871e56fd57..628ca8e0b9d 100644 --- a/dd-smoke-tests/wildfly/gradle.lockfile +++ b/dd-smoke-tests/wildfly/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=testCompileClasspath,testRuntimeClasspath com.blogspot.mydailyjava:weak-lock-free:0.17=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.4=testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=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 @@ -26,8 +26,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,8 +52,8 @@ io.sqreen:libsqreen:17.5.0=testRuntimeClasspath javax.servlet:javax.servlet-api:3.1.0=testCompileClasspath,testRuntimeClasspath jaxen:jaxen:2.0.6=spotbugs junit:junit:4.13.2=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy-agent:1.18.10=testCompileClasspath,testRuntimeClasspath -net.bytebuddy:byte-buddy:1.18.10=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy-agent:1.18.12=testCompileClasspath,testRuntimeClasspath +net.bytebuddy:byte-buddy:1.18.12=testCompileClasspath,testRuntimeClasspath net.java.dev.jna:jna-platform:5.8.0=testRuntimeClasspath net.java.dev.jna:jna:5.13.0=testCompileClasspath,testRuntimeClasspath net.sf.saxon:Saxon-HE:12.10=spotbugs @@ -95,7 +95,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-api/gradle.lockfile b/dd-trace-api/gradle.lockfile index 244f6629059..5938a92162f 100644 --- a/dd-trace-api/gradle.lockfile +++ b/dd-trace-api/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java index f8111224ed7..0054655b6f7 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/AIGuard.java @@ -49,7 +49,9 @@ public static Evaluation evaluate(final List messages) { * * @param messages the collection of messages to evaluate (prompts, responses, tool calls, etc.) * @param options configuration options for the evaluation process - * @return an {@link Evaluation} containing the security decision and reasoning + * @return an {@link Evaluation} containing the security decision, the reasoning, and the + * evaluated messages (redacted when redaction was applied, see {@link + * Evaluation#getMessages()}) * @throws AIGuardAbortError if the evaluation action is not ALLOW (DENY or ABORT) and blocking is * enabled * @throws AIGuardClientError if there are client-side errors communicating with the AIGuard REST @@ -169,27 +171,81 @@ public static class Evaluation { final List tags; final Map tagProbs; final List sds; + final List messages; + final List redactionReplacements; /** - * Creates a new evaluation result. + * Creates a new evaluation result carrying no messages. * * @param action the recommended action for the evaluated content * @param reason human-readable explanation for the decision * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection) * @param tagProbs map of tags associated to their probability * @param sds list of Sensitive Data Scanner findings + * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List)} instead, so the + * evaluated messages are available to the caller. */ + @Deprecated public Evaluation( final Action action, final String reason, final List tags, final Map tagProbs, final List sds) { + this(action, reason, tags, tagProbs, sds, Collections.emptyList()); + } + + /** + * Creates a new evaluation result carrying no redaction replacements. + * + * @param action the recommended action for the evaluated content + * @param reason human-readable explanation for the decision + * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection) + * @param tagProbs map of tags associated to their probability + * @param sds list of Sensitive Data Scanner findings + * @param messages the evaluated messages, redacted when redaction was applied + * @deprecated use {@link #Evaluation(Action, String, List, Map, List, List, List)} instead, so + * the applied redaction replacements are available to the caller. + */ + @Deprecated + public Evaluation( + final Action action, + final String reason, + final List tags, + final Map tagProbs, + final List sds, + final List messages) { + this(action, reason, tags, tagProbs, sds, messages, Collections.emptyList()); + } + + /** + * Creates a new evaluation result. + * + * @param action the recommended action for the evaluated content + * @param reason human-readable explanation for the decision + * @param tags list of tags associated with the evaluation (e.g. indirect-prompt-injection) + * @param tagProbs map of tags associated to their probability + * @param sds list of Sensitive Data Scanner findings + * @param messages the evaluated messages, redacted when redaction was applied + * @param redactionReplacements the {@code redaction_replacements} array as returned by the + * AIGuard service + */ + public Evaluation( + final Action action, + final String reason, + final List tags, + final Map tagProbs, + final List sds, + final List messages, + final List redactionReplacements) { this.action = action; this.reason = reason; this.tags = tags; this.tagProbs = tagProbs; this.sds = sds != null ? sds : Collections.emptyList(); + this.messages = messages != null ? messages : Collections.emptyList(); + this.redactionReplacements = + redactionReplacements != null ? redactionReplacements : Collections.emptyList(); } /** @@ -236,6 +292,38 @@ public Map getTagProbabilities() { public List getSds() { return sds; } + + /** + * Returns the evaluated messages, with sensitive data redacted whenever the AIGuard service + * requested redaction and redaction is enabled locally. + * + *

When nothing was redacted, this is the very same list that was passed to {@link + * AIGuard#evaluate(List, Options)}. The caller's list is never mutated. + * + * @return the evaluated messages, redacted when redaction was applied + */ + public List getMessages() { + return messages; + } + + /** + * Returns the redaction replacements the AIGuard service asked for, exactly as it returned + * them. + * + *

Each entry is a {@code {path, replacement}} pair addressing one string in the evaluated + * conversation, e.g. {@code messages[1].content} or {@code + * messages[2].tool_calls[0].function.arguments}. + * + *

This is detection metadata, not a record of what the tracer did: entries the tracer could + * not resolve are skipped fail-safe but still reported here, and the whole array is reported + * even when redaction is disabled locally, in which case none of it was applied. Use {@link + * #getMessages()} for the conversation as it actually stands. + * + * @return the service's redaction replacements, empty when it asked for none + */ + public List getRedactionReplacements() { + return redactionReplacements; + } } /** diff --git a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java index 4389eba0c41..95dce0803c7 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/aiguard/noop/NoOpEvaluator.java @@ -14,6 +14,13 @@ public final class NoOpEvaluator implements Evaluator { @Override public Evaluation evaluate(final List messages, final Options options) { - return new Evaluation(ALLOW, "AI Guard is not enabled", emptyList(), emptyMap(), emptyList()); + return new Evaluation( + ALLOW, + "AI Guard is not enabled", + emptyList(), + emptyMap(), + emptyList(), + messages, + emptyList()); } } diff --git a/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java b/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java index 2d685c4a098..57d5714a5f3 100644 --- a/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java +++ b/dd-trace-api/src/main/java/datadog/trace/api/config/AIGuardConfig.java @@ -7,8 +7,10 @@ public final class AIGuardConfig { public static final String AI_GUARD_TIMEOUT = "ai_guard.timeout"; public static final String AI_GUARD_MAX_CONTENT_SIZE = "ai_guard.max-content-size"; public static final String AI_GUARD_MAX_MESSAGES_LENGTH = "ai_guard.max-messages-length"; + public static final String AI_GUARD_REDACTION_ENABLED = "ai_guard.redaction.enabled"; public static final boolean DEFAULT_AI_GUARD_ENABLED = false; + public static final boolean DEFAULT_AI_GUARD_REDACTION_ENABLED = true; public static final int DEFAULT_AI_GUARD_TIMEOUT = 10_000; public static final int DEFAULT_AI_GUARD_MAX_CONTENT_SIZE = 512 * 1024; public static final int DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH = 16; diff --git a/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java b/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java index 0d44d81a975..6676c698a4e 100644 --- a/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java +++ b/dd-trace-api/src/test/java/datadog/trace/api/aiguard/AIGuardTest.java @@ -4,11 +4,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; 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 java.util.Arrays; import java.util.Collections; import java.util.List; +import java.util.Map; import org.junit.jupiter.api.Test; class AIGuardTest { @@ -76,6 +78,94 @@ void testNoopImplementation() { assertEquals(ALLOW, evaluation.getAction()); assertEquals("AI Guard is not enabled", evaluation.getReason()); + // nothing is redacted, so the very same list is handed back + assertSame(messages, evaluation.getMessages()); + } + + @Test + void testNoopImplementationWithoutMessages() { + // Evaluation normalises a null message list, so the no-op evaluator need not guard for it. + AIGuard.Evaluation evaluation = AIGuard.evaluate(null); + + assertEquals(ALLOW, evaluation.getAction()); + assertNotNull(evaluation.getMessages()); + assertTrue(evaluation.getMessages().isEmpty()); + } + + @Test + @SuppressWarnings("deprecation") + void testEvaluationCarriesMessages() { + List messages = + Collections.singletonList(AIGuard.Message.message("user", "My SSN is ")); + + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, "No rule match.", Collections.emptyList(), null, null, messages); + + assertSame(messages, evaluation.getMessages()); + } + + @Test + @SuppressWarnings("deprecation") + void testEvaluationWithoutMessagesReturnsEmptyList() { + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, "No rule match.", Collections.emptyList(), null, null); + + assertNotNull(evaluation.getMessages()); + assertTrue(evaluation.getMessages().isEmpty()); + } + + @Test + @SuppressWarnings("deprecation") + void testEvaluationWithNullMessagesReturnsEmptyList() { + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, "No rule match.", Collections.emptyList(), null, null, null); + + assertNotNull(evaluation.getMessages()); + assertTrue(evaluation.getMessages().isEmpty()); + } + + @Test + void testEvaluationCarriesRedactionReplacements() { + List messages = + Collections.singletonList(AIGuard.Message.message("user", "My SSN is ")); + List> replacements = + Collections.singletonList(Collections.singletonMap("path", "messages[0].content")); + + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, + "No rule match.", + Collections.emptyList(), + null, + null, + messages, + replacements); + + assertSame(replacements, evaluation.getRedactionReplacements()); + } + + @Test + @SuppressWarnings("deprecation") + void testEvaluationWithoutReplacementsReturnsEmptyList() { + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, "No rule match.", Collections.emptyList(), null, null, null); + + assertNotNull(evaluation.getRedactionReplacements()); + assertTrue(evaluation.getRedactionReplacements().isEmpty()); + } + + @Test + void testEvaluationWithNullReplacementsReturnsEmptyList() { + AIGuard.Evaluation evaluation = + new AIGuard.Evaluation( + ALLOW, "No rule match.", Collections.emptyList(), null, null, null, null); + + assertNotNull(evaluation.getRedactionReplacements()); + assertTrue(evaluation.getRedactionReplacements().isEmpty()); } @Test diff --git a/dd-trace-core/gradle.lockfile b/dd-trace-core/gradle.lockfile index 0021d92240f..7ed2d466540 100644 --- a/dd-trace-core/gradle.lockfile +++ b/dd-trace-core/gradle.lockfile @@ -10,7 +10,7 @@ com.amazonaws:aws-lambda-java-events:3.11.0=jmhRuntimeClasspath,testCompileClass com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath @@ -29,8 +29,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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 com.google.auto.service:auto-service:1.1.1=testAnnotationProcessor,traceAgentTestAnnotationProcessor @@ -115,7 +115,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath,traceAgentTestRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath org.msgpack:jackson-dataformat-msgpack:0.8.20=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath,traceAgentTestCompileClasspath,traceAgentTestRuntimeClasspath diff --git a/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java b/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java index 1a1de2bc795..0c3186e71ac 100644 --- a/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java +++ b/dd-trace-core/src/jmh/java/datadog/trace/core/ScopeLifecycleBenchmark.java @@ -2,7 +2,7 @@ import static java.util.concurrent.TimeUnit.MICROSECONDS; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import org.openjdk.jmh.annotations.Benchmark; import org.openjdk.jmh.annotations.BenchmarkMode; @@ -32,7 +32,7 @@ public class ScopeLifecycleBenchmark { public static class ThreadState { AgentSpan span; AgentSpan childSpan; - AgentScope activeScope; + ContextScope activeScope; @Setup(Level.Iteration) public void setup() { @@ -51,22 +51,22 @@ public void tearDown() { @Benchmark public void activateAndClose(ThreadState state) { - AgentScope scope = TRACER.activateSpan(state.span); + ContextScope scope = TRACER.activateSpan(state.span); scope.close(); } @Benchmark public void activateSameSpan(ThreadState state) { - AgentScope outer = TRACER.activateSpan(state.span); - AgentScope inner = TRACER.activateSpan(state.span); + ContextScope outer = TRACER.activateSpan(state.span); + ContextScope inner = TRACER.activateSpan(state.span); inner.close(); outer.close(); } @Benchmark public void nestedActivateAndClose(ThreadState state) { - AgentScope parentScope = TRACER.activateSpan(state.span); - AgentScope childScope = TRACER.activateSpan(state.childSpan); + ContextScope parentScope = TRACER.activateSpan(state.span); + ContextScope childScope = TRACER.activateSpan(state.childSpan); childScope.close(); parentScope.close(); } 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 e9e130847b9..e87469b045e 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 @@ -66,7 +66,6 @@ import datadog.trace.api.scopemanager.ScopeListener; import datadog.trace.api.time.SystemTimeSource; import datadog.trace.api.time.TimeSource; -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.AgentSpanLink; @@ -1226,12 +1225,12 @@ public AgentSpan startSpan( } @Override - public AgentScope activateSpan(AgentSpan span) { + public ContextScope activateSpan(AgentSpan span) { return scopeManager.activateSpan(span); } @Override - public AgentScope activateManualSpan(final AgentSpan span) { + public ContextScope activateManualSpan(final AgentSpan span) { return scopeManager.activateManualSpan(span); } @@ -1261,7 +1260,7 @@ public void closePrevious(boolean finishSpan) { } @Override - public AgentScope activateNext(AgentSpan span) { + public ContextScope activateNext(AgentSpan span) { if (!InstrumenterConfig.get().isLegacyContextManagerEnabled()) { throw new IllegalStateException( "activateNext must not be called when context swap based logic is enabled"); @@ -1302,7 +1301,7 @@ public void rollbackActiveToCheckpoint() { @Override public void closeActive() { - AgentScope activeScope = this.scopeManager.active(); + ContextScope activeScope = this.scopeManager.active(); if (activeScope != null) { activeScope.close(); } @@ -1502,7 +1501,7 @@ public boolean addTraceInterceptor(final TraceInterceptor interceptor) { @Override public TraceScope muteTracing() { - return activateSpan(blackholeSpan()); + return activateSpan(blackholeSpan())::close; } @Override @@ -2227,8 +2226,14 @@ protected static final DDSpanContext buildSpanContext( if (!tracer.allowInferredServices) { final DDSpan rootSpan = parentTraceCollector.getRootSpan(); if (rootSpan != null) { - serviceName = rootSpan.getServiceName(); - serviceNameSource = rootSpan.getServiceNameSource(); + // An inferred proxy represents the gateway, not the application service. + // Preserve the service and source already resolved for spans beneath it. + // Avoid the synchronized tag lookup when inferred proxies are disabled. + if (!tracer.initialConfig.isInferredProxyPropagationEnabled() + || rootSpan.getTag("_dd.inferred_span") == null) { + serviceName = rootSpan.getServiceName(); + serviceNameSource = rootSpan.getServiceNameSource(); + } } else { serviceName = null; } 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 ba7e5288a68..0f6feaf095c 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 @@ -1,13 +1,13 @@ package datadog.trace.core.scopemanager; import datadog.context.Context; +import datadog.context.ContextScope; import datadog.trace.api.Stateful; import datadog.trace.api.scopemanager.ExtendedScopeListener; import datadog.trace.api.scopemanager.ScopeListener; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; -class ContinuableScope implements AgentScope { +class ContinuableScope implements ContextScope { // different sources of scopes static final byte INSTRUMENTATION = 0; @@ -123,12 +123,10 @@ final boolean alive() { return referenceCount > 0; } - @Override public final boolean isAsyncPropagating() { return asyncPropagating; } - @Override public final AgentSpan span() { return AgentSpan.fromContext(context); } @@ -138,7 +136,6 @@ public Context context() { return context; } - @Override public final void setAsyncPropagation(final boolean value) { asyncPropagating = value; } 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 33e6580574e..7f0e1a92c1e 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 @@ -19,7 +19,6 @@ import datadog.trace.api.Stateful; import datadog.trace.api.scopemanager.ExtendedScopeListener; import datadog.trace.api.scopemanager.ScopeListener; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentTraceCollector; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -100,15 +99,15 @@ public ContinuableScopeManager( !(profilingContextIntegration instanceof ProfilingContextIntegration.NoOp); } - public AgentScope activateSpan(final AgentSpan span) { + public ContextScope activateSpan(final AgentSpan span) { return activate(span, INSTRUMENTATION, true, DEFAULT_ASYNC_PROPAGATING); } - public AgentScope activateManualSpan(final AgentSpan span) { + public ContextScope activateManualSpan(final AgentSpan span) { return activate(span, MANUAL, false, /* ignored */ false); } - private AgentScope activate( + private ContextScope activate( final AgentSpan span, final byte source, final boolean overrideAsyncPropagation, @@ -149,7 +148,7 @@ private AgentScope activate( return scope; } - private AgentScope activate(final Context context) { + private ContextScope activate(final Context context) { ScopeStack scopeStack = scopeStack(); final ContinuableScope top = scopeStack.top; @@ -250,7 +249,7 @@ public void closePrevious(final boolean finishSpan) { } } - public AgentScope activateNext(final AgentSpan span) { + public ContextScope activateNext(final AgentSpan span) { ScopeStack scopeStack = scopeStack(); final int currentDepth = scopeStack.depth(); @@ -279,7 +278,7 @@ public AgentScope activateNext(final AgentSpan span) { return scope; } - public AgentScope active() { + public ContextScope active() { return scopeStack().active(); } diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java index 3aae3404281..32a36f9c207 100644 --- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java +++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaAppSecHandler.java @@ -5,7 +5,6 @@ import static datadog.trace.lambda.LambdaEventParser.buildFullPath; import static datadog.trace.lambda.LambdaEventParser.findHeader; import static datadog.trace.lambda.LambdaEventParser.parseEvent; -import static datadog.trace.lambda.LambdaEventParser.parseJsonValue; import static datadog.trace.lambda.LambdaEventParser.parseResponse; import datadog.logging.RatelimitedLogger; @@ -38,7 +37,6 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.nio.charset.StandardCharsets; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -185,6 +183,12 @@ public static void processResponseData(AgentSpan span, Object result) { return; } + // Only process response for known HTTP trigger types. + LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get(); + if (triggerType == null || !triggerType.isHttp()) { + return; + } + try { byte[] bytes = ((ByteArrayOutputStream) result).toByteArray(); if (bytes.length == 0 || bytes.length > MAX_EVENT_SIZE) { @@ -195,42 +199,18 @@ public static void processResponseData(AgentSpan span, Object result) { return; } - String json = new String(bytes, StandardCharsets.UTF_8); - LambdaResponseData responseData = parseResponse(json); - - // Only process responses for known HTTP trigger types - LambdaTriggerType triggerType = CURRENT_TRIGGER_TYPE.get(); - if (triggerType == null || !triggerType.isHttp()) { - return; - } + String rawResponse = new String(bytes, StandardCharsets.UTF_8); + LambdaResponseData responseData = parseResponse(rawResponse, triggerType); - if (responseData == null || responseData.statusCode == 0) { - // No statusCode means this is not an API-GW formatted response, or JSON parsing failed. - if (responseData == null || (responseData.headers.isEmpty() && responseData.body == null)) { - // Parse failed or response has no API-GW structure (plain JSON body). - // Treat the full response as the body - Object fallbackBody; - String fallbackContentType; - try { - fallbackBody = parseJsonValue(json); - fallbackContentType = "application/json"; - } catch (Exception e) { - fallbackBody = json; - fallbackContentType = "text/plain"; - } - Map fallbackHeaders = - Collections.singletonMap("content-type", fallbackContentType); - responseData = new LambdaResponseData(0, fallbackHeaders, fallbackBody); - } - // else: responseData has explicit headers/body fields — keep them, just skip - // responseStarted - // (statusCode remains 0, so the responseStarted guard below will not fire). - } + // A missing or non-positive status is not one the client can have seen, so it is published + // neither to the span nor to the WAF. + Integer statusCode = responseData.statusCode; + boolean hasUsableStatus = statusCode != null && statusCode > 0; // The only HTTP tag set on the exit path: the status does not exist at span creation. - if (responseData.statusCode > 0) { - span.setHttpStatusCode(responseData.statusCode); - boolean isError = Config.get().getHttpServerErrorStatuses().get(responseData.statusCode); + if (hasUsableStatus) { + span.setHttpStatusCode(statusCode); + boolean isError = Config.get().getHttpServerErrorStatuses().get(statusCode); span.setError(isError, ErrorPriorities.HTTP_SERVER_DECORATOR); } @@ -246,17 +226,18 @@ public static void processResponseData(AgentSpan span, Object result) { // Fire response gateway events. Flow results are intentionally ignored: blocking on response // is not supported for Lambda because remote config is unavailable in that environment. - // Fire responseStarted - if (responseData.statusCode > 0) { + // Fire responseStarted only for usable HTTP statuses: an unusable one must not unlock + // publication of the response status and headers to the WAF. + if (hasUsableStatus) { BiFunction> responseStartedCb = cbp.getCallback(EVENTS.responseStarted()); if (responseStartedCb != null) { - responseStartedCb.apply(requestContext, responseData.statusCode); + responseStartedCb.apply(requestContext, statusCode); } } // Fire responseHeader for each allowed header - if (responseData.headers != null && !responseData.headers.isEmpty()) { + if (!responseData.headers.isEmpty()) { TriConsumer responseHeaderCb = cbp.getCallback(EVENTS.responseHeader()); if (responseHeaderCb != null) { diff --git a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java index 43042c4710d..6dfcca2729c 100644 --- a/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java +++ b/dd-trace-core/src/main/java/datadog/trace/lambda/LambdaEventParser.java @@ -108,24 +108,45 @@ static LambdaRequestData parseEvent(String json) { } /** - * Parses a Lambda handler response. + * Parses a Lambda handler response into what the gateway would have put on the wire for the given + * trigger. * - * @param json the raw response payload - * @return the extracted response data, or {@code null} if the payload is not a JSON object + *

A return value that is not an API-GW envelope is reported as the body in full, with the + * {@code application/json} content type the gateway applies to it. The envelope-looking fields of + * a near-miss payload are then ordinary body content: a {@code body} field stays base64-encoded + * and a declared content type is neither honoured nor forwarded, which is what the client sees. + * + * @param rawResponseString the raw response payload + * @param triggerType the trigger the invocation came from + * @return the response data, never {@code null} */ - static LambdaResponseData parseResponse(String json) { + static LambdaResponseData parseResponse(String rawResponseString, LambdaTriggerType triggerType) { + Object rawResponse; try { - Map response = MAP_ADAPTER.fromJson(json); - if (response == null) { - return null; - } + rawResponse = OBJECT_ADAPTER.fromJson(rawResponseString); + } catch (Exception e) { + log.debug("Failed to parse response data from JSON", e); + // Not JSON at all, so not a valid response for any HTTP trigger. + return new LambdaResponseData( + null, Collections.singletonMap("content-type", "text/plain"), rawResponseString); + } + + Map response = rawResponse instanceof Map ? (Map) rawResponse : null; - // Extract status code - int statusCode = 0; + // On a trigger with implicit success, a return value without statusCode is not a response the + // gateway honours — it serialises the whole value as the body of a 200. Decided before the + // envelope fields are read, because they are then ordinary body content. + if (triggerType.supportsImplicitSuccessStatus() + && (response == null || !response.containsKey("statusCode"))) { + return new LambdaResponseData( + 200, Collections.singletonMap("content-type", "application/json"), rawResponse); + } + + if (response != null) { + // The status as the payload carried it, null when it carried none or a non-numeric one Object statusCodeObj = response.get("statusCode"); - if (statusCodeObj instanceof Number) { - statusCode = ((Number) statusCodeObj).intValue(); - } + Integer statusCode = + statusCodeObj instanceof Number ? ((Number) statusCodeObj).intValue() : null; // Extract headers — keys are lowercased to normalise casing across API GW / ALB variants Map headers = extractHeaderMap(response.get("headers")); @@ -133,45 +154,44 @@ static LambdaResponseData parseResponse(String json) { // Merge multiValueHeaders if present (API GW v1 / ALB), also lowercasing keys headers = mergeMultiValueHeaders(headers, response.get("multiValueHeaders")); - // Extract body - Object body = null; - Object bodyObj = response.get("body"); - if (bodyObj != null) { - String bodyString = String.valueOf(bodyObj); - - // Handle base64 encoding - Object isBase64EncodedObj = response.get("isBase64Encoded"); - if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) { - try { - bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8); - } catch (Exception e) { - log.debug("Failed to decode base64 response body", e); - bodyString = null; - } - } + Object body = extractResponseBody(response, headers); - if (bodyString != null) { - // A response body is only ever structured as JSON, never as urlencoded or multipart - MediaType mediaType = MediaType.parse(headers.get("content-type")); - Object parsed = - ContentTypeBodyParser.isJsonOrUntyped(mediaType) ? parseBodyAsJson(bodyString) : null; - body = parsed != null ? parsed : bodyString; - } + // An object carrying none of the envelope fields is an ordinary return value the gateway + // serialises wholesale, not a response it honours. Any numeric statusCode counts, including + // 0: the handler put it there deliberately, however unusable it is. + if (statusCode != null || !headers.isEmpty() || body != null) { + return new LambdaResponseData(statusCode, headers, body); } + } - return new LambdaResponseData(statusCode, headers, body); - } catch (Exception e) { - log.debug("Failed to parse response data from JSON", e); + return new LambdaResponseData( + null, Collections.singletonMap("content-type", "application/json"), rawResponse); + } + + /** Extracts the {@code body} field of an API-GW envelope, decoded and parsed where applicable. */ + private static Object extractResponseBody(Map response, Map headers) { + Object bodyObj = response.get("body"); + if (bodyObj == null) { return null; } - } + String bodyString = String.valueOf(bodyObj); - /** - * Parses an arbitrary JSON value, propagating parse failures so the caller can distinguish a - * malformed payload from a JSON {@code null}. - */ - static Object parseJsonValue(String json) throws IOException { - return OBJECT_ADAPTER.fromJson(json); + // Handle base64 encoding + Object isBase64EncodedObj = response.get("isBase64Encoded"); + if (Boolean.TRUE.equals(isBase64EncodedObj) || "true".equals(isBase64EncodedObj)) { + try { + bodyString = new String(Base64.getDecoder().decode(bodyString), StandardCharsets.UTF_8); + } catch (Exception e) { + log.debug("Failed to decode base64 response body", e); + return null; + } + } + + // A response body is only ever structured as JSON, never as urlencoded or multipart + MediaType mediaType = MediaType.parse(headers.get("content-type")); + Object parsed = + ContentTypeBodyParser.isJsonOrUntyped(mediaType) ? parseBodyAsJson(bodyString) : null; + return parsed != null ? parsed : bodyString; } static LambdaTriggerType detectTriggerType(Map event) { @@ -747,6 +767,14 @@ boolean isHttp() { return false; } } + + /** + * Whether the trigger turns a return value carrying no {@code statusCode} into a 200 response. + * HTTP API v2 and Function URLs do; the proxy-only triggers reject such a response instead. + */ + boolean supportsImplicitSuccessStatus() { + return this == API_GATEWAY_V2_HTTP || this == LAMBDA_URL; + } } /** Data extracted from a Lambda event, for the WAF request callbacks and the HTTP span tags. */ @@ -828,11 +856,18 @@ static class LambdaRequestData { * http.status_code}. */ static class LambdaResponseData { - final int statusCode; + /** + * Status as the payload carried it, defaulted to 200 when the trigger turns a return value + * without a {@code statusCode} into a success. {@code null} when the payload carried none, or + * one that is not a number. Kept verbatim: a value outside the HTTP range reached the gateway + * too, so callers decide for themselves whether to report it. + */ + final Integer statusCode; + final Map headers; final Object body; - LambdaResponseData(int statusCode, Map headers, Object body) { + LambdaResponseData(Integer statusCode, Map headers, Object body) { this.statusCode = statusCode; this.headers = headers; this.body = body; diff --git a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java index 2b8a85992e1..c1961472ef0 100644 --- a/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java +++ b/dd-trace-core/src/main/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapper.java @@ -87,8 +87,6 @@ public class LLMObsSpanMapper implements RemoteMapper { private static final byte[] PAGENT_NAME = "pagent_name".getBytes(StandardCharsets.UTF_8); private static final byte[] PAGENT_SPAN_ID = "pagent_span_id".getBytes(StandardCharsets.UTF_8); private static final byte[] METADATA = "metadata".getBytes(StandardCharsets.UTF_8); - private static final byte[] AGENT_MANIFEST_KEY = - "agent_manifest".getBytes(StandardCharsets.UTF_8); private static final byte[] PROMPT = "prompt".getBytes(StandardCharsets.UTF_8); private static final byte[] SPAN_KIND = "span.kind".getBytes(StandardCharsets.UTF_8); private static final byte[] SPANS = "spans".getBytes(StandardCharsets.UTF_8); @@ -398,7 +396,6 @@ private static final class MetaWriter implements MetadataConsumer { LLMOBS_TAG_PREFIX + LLMObsTags.MODEL_VERSION, LLMOBS_TAG_PREFIX + LLMObsTags.TOOL_DEFINITIONS, LLMOBS_TAG_PREFIX + LLMObsTags.METADATA, - LLMOBS_TAG_PREFIX + LLMObsTags.AGENT_MANIFEST, PAGENT_SPAN_ID_TAG_INTERNAL_FULL, PAGENT_NAME_TAG_INTERNAL_FULL))); @@ -618,14 +615,6 @@ public void accept(Metadata metadata) { writable.writeString(entry.getKey(), null); writable.writeObject(entry.getValue(), null); } - } else if (key.equals(LLMObsTags.AGENT_MANIFEST) && val instanceof Map) { - Map manifestMap = (Map) val; - writable.writeUTF8(AGENT_MANIFEST_KEY); - writable.startMap(manifestMap.size()); - for (Map.Entry entry : manifestMap.entrySet()) { - writable.writeString(String.valueOf(entry.getKey()), null); - writable.writeObject(entry.getValue(), null); - } } else { writable.writeString(key, null); writable.writeObject(val, null); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java b/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java index d6b35bc93dc..4d0e94b5369 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/BlackholeSpanTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertFalse; 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.common.writer.ListWriter; import java.util.Arrays; @@ -24,13 +24,13 @@ void shouldMuteTracing(String use128bitTraceId) throws Exception { CoreTracer tracer = tracerBuilder().withProperties(props).writer(writer).build(); try { AgentSpan root = tracer.startSpan("test", "root"); - AgentScope scope1 = tracer.activateSpan(root); + ContextScope scope1 = tracer.activateSpan(root); AgentSpan bh; AgentSpan ignored; AgentSpan child; try { bh = tracer.blackholeSpan(); - AgentScope scope2 = tracer.activateSpan(bh); + ContextScope scope2 = tracer.activateSpan(bh); try { ignored = tracer.startSpan("test", "ignored"); ignored.finish(); 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 9d9367551a7..0b119c0fe3f 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 @@ -23,6 +23,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import datadog.context.ContextScope; import datadog.trace.api.Config; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; @@ -31,7 +32,6 @@ import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.naming.SpanNaming; import datadog.trace.api.sampling.PrioritySampling; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanLink; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; @@ -210,12 +210,13 @@ void shouldLinkToParentSpan() { }) void shouldLinkToParentSpanImplicitly( boolean noopParent, String serviceName, boolean expectTopLevel) { - try (AgentScope parent = + try (ContextScope parent = tracer.activateSpan( noopParent ? noopSpan() : tracer.buildSpan("test", "parent").withServiceName("service").start())) { - long expectedParentId = noopParent ? DDSpanId.ZERO : parent.span().spanContext().getSpanId(); + long expectedParentId = + noopParent ? DDSpanId.ZERO : AgentSpan.fromScope(parent).spanContext().getSpanId(); DDSpan span = (DDSpan) tracer.buildSpan("test", "fakeName").withServiceName(serviceName).start(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java index ea187ab9ef0..309ac1db3ba 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceStrictWriteTest.java @@ -5,7 +5,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import datadog.context.ContextContinuation; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import java.util.ArrayList; import java.util.Arrays; import org.junit.jupiter.api.Test; @@ -14,7 +14,7 @@ public class PendingTraceStrictWriteTest extends PendingTraceTestBase { @Test void traceNotReportedUntilContinuationClosed() throws InterruptedException { - AgentScope scope = tracer.activateSpan(rootSpan); + ContextScope scope = tracer.activateSpan(rootSpan); ContextContinuation continuation = tracer.capture(rootSpan); scope.close(); rootSpan.finish(); @@ -40,7 +40,7 @@ void traceNotReportedUntilContinuationClosed() throws InterruptedException { @Test void negativeReferenceCountThrowsException() { - AgentScope scope = tracer.activateSpan(rootSpan); + ContextScope scope = tracer.activateSpan(rootSpan); ContextContinuation continuation = tracer.capture(rootSpan); scope.close(); rootSpan.finish(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java index ff9f23841a1..7d47a0b17c5 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/PendingTraceTest.java @@ -9,11 +9,11 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import datadog.context.ContextScope; import datadog.environment.JavaVirtualMachine; import datadog.trace.api.DDTraceId; import datadog.trace.api.datastreams.NoopPathwayContext; import datadog.trace.api.time.TimeSource; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.core.monitor.HealthMetrics; import datadog.trace.core.propagation.PropagationTags; import java.util.ArrayList; @@ -78,7 +78,7 @@ private DDSpan createSimpleSpanWithID(PendingTrace trace, long id) { @Test void traceStillReportedWhenUnfinishedContinuationDiscarded() throws InterruptedException, TimeoutException { - AgentScope scope = tracer.activateSpan(rootSpan); + ContextScope scope = tracer.activateSpan(rootSpan); tracer.capture(rootSpan); scope.close(); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java new file mode 100644 index 00000000000..caa0f407a61 --- /dev/null +++ b/dd-trace-core/src/test/java/datadog/trace/core/ServiceNameInheritanceForkedTest.java @@ -0,0 +1,80 @@ +package datadog.trace.core; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + +import datadog.trace.api.config.TracerConfig; +import datadog.trace.api.naming.SpanNaming; +import datadog.trace.bootstrap.instrumentation.api.ServiceNameSources; +import datadog.trace.common.writer.ListWriter; +import datadog.trace.test.junit.utils.config.WithConfig; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.CsvSource; + +// SpanNaming caches the removal setting, so these tests need their own JVM. +@WithConfig(key = TracerConfig.TRACE_SPAN_ATTRIBUTE_SCHEMA, value = "v0") +@WithConfig(key = TracerConfig.TRACE_REMOVE_INTEGRATION_SERVICE_NAMES_ENABLED, value = "true") +@WithConfig(key = TracerConfig.TRACE_INFERRED_PROXY_SERVICES_ENABLED, value = "true") +class ServiceNameInheritanceForkedTest extends DDCoreJavaSpecification { + + @ParameterizedTest + @CsvSource({"checkout, servlet-context", "special-checkout, manual"}) + void descendantsRetainApplicationServiceUnderInferredProxy(String service, String source) { + CoreTracer tracer = tracerBuilder().writer(new ListWriter()).serviceName("checkout").build(); + assertFalse(SpanNaming.instance().namingSchema().allowInferredServices()); + + DDSpan proxy = (DDSpan) tracer.buildSpan("test", "aws.apigateway").start(); + proxy.setServiceName("gateway.example.com", "inferred-proxy"); + proxy.setTag("_dd.inferred_span", 1); + + DDSpan entry = + (DDSpan) tracer.buildSpan("test", "servlet.request").asChildOf(proxy.spanContext()).start(); + // HTTP server decoration resets the application entry service after creating it. + entry.setServiceName(service, source); + DDSpan child = + (DDSpan) tracer.buildSpan("test", "application").asChildOf(entry.spanContext()).start(); + DDSpan grandchild = + (DDSpan) + tracer + .buildSpan("test", "database.query") + .asChildOf(child.spanContext()) + .withServiceName(SpanNaming.instance().namingSchema().database().service("mysql")) + .start(); + + grandchild.finish(); + child.finish(); + entry.finish(); + proxy.finish(); + + assertEquals("gateway.example.com", proxy.getServiceName()); + for (DDSpan span : new DDSpan[] {entry, child, grandchild}) { + assertEquals(service, span.getServiceName()); + assertEquals(source, span.getServiceNameSource()); + } + } + + @ParameterizedTest + @CsvSource({"checkout, servlet-context", "special-checkout, manual"}) + void ordinaryRootStillOverridesIntermediateAndExplicitServices(String service, String source) { + CoreTracer tracer = tracerBuilder().writer(new ListWriter()).serviceName("checkout").build(); + DDSpan root = (DDSpan) tracer.buildSpan("test", "servlet.request").start(); + root.setServiceName(service, source); + DDSpan child = + (DDSpan) tracer.buildSpan("test", "application").asChildOf(root.spanContext()).start(); + child.setServiceName("intermediate-service", ServiceNameSources.MANUAL); + DDSpan grandchild = + (DDSpan) + tracer + .buildSpan("test", "database.query") + .asChildOf(child.spanContext()) + .withServiceName("explicit-service") + .start(); + + grandchild.finish(); + child.finish(); + root.finish(); + + assertEquals(service, grandchild.getServiceName()); + assertEquals(source, grandchild.getServiceNameSource()); + } +} diff --git a/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java b/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java index 1310d0f5820..c7f63ce836e 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/TraceCorrelationTest.java @@ -4,8 +4,8 @@ import static datadog.trace.api.config.TracerConfig.TRACE_128_BIT_TRACEID_GENERATION_ENABLED; import static org.junit.jupiter.api.Assertions.assertEquals; +import datadog.context.ContextScope; import datadog.trace.api.DDTraceId; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.common.writer.ListWriter; import datadog.trace.test.junit.utils.config.WithConfigExtension; @@ -25,7 +25,7 @@ void getTraceIdWithoutTrace(boolean log128bTraceId) { CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); AgentSpan span = tracer.buildSpan("datadog", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); scope.close(); assertEquals("0", tracer.getTraceId()); @@ -44,9 +44,9 @@ void getTraceIdWithTrace(boolean log128bTraceId) { CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); AgentSpan span = tracer.buildSpan("datadog", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); - DDTraceId traceId = ((DDSpan) scope.span()).getTraceId(); + DDTraceId traceId = ((DDSpan) AgentSpan.fromScope(scope)).getTraceId(); String formattedTraceId = log128bTraceId ? traceId.toHexString() : traceId.toString(); assertEquals(formattedTraceId, tracer.getTraceId()); @@ -59,7 +59,7 @@ void getTraceIdWithTrace(boolean log128bTraceId) { void getSpanIdWithoutSpan() { CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); AgentSpan span = tracer.buildSpan("datadog", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); scope.close(); assertEquals("0", tracer.getSpanId()); @@ -72,9 +72,10 @@ void getSpanIdWithoutSpan() { void getSpanIdWithTrace() { CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); AgentSpan span = tracer.buildSpan("datadog", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); - assertEquals(Long.toString(((DDSpan) scope.span()).getSpanId()), tracer.getSpanId()); + assertEquals( + Long.toString(((DDSpan) AgentSpan.fromScope(scope)).getSpanId()), tracer.getSpanId()); scope.close(); span.finish(); 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 07681335c4c..9fd36af327d 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 @@ -4,9 +4,9 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertTrue; +import datadog.context.ContextScope; import datadog.trace.api.experimental.DataStreamsCheckpointer; import datadog.trace.api.experimental.DataStreamsContextCarrier; -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; @@ -32,7 +32,7 @@ void testSettingProduceAndConsumeCheckpoint() { CustomContextCarrier carrier = new CustomContextCarrier(); // Start and activate a span AgentSpan span = tracer.buildSpan("test", "dsm-checkpoint").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); // Trigger produce checkpoint checkpointer.setProduceCheckpoint("kafka", "testTopic", carrier); 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 9903867e1c4..d8d13351782 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 @@ -10,9 +10,9 @@ import static java.util.Collections.singletonMap; import static org.junit.jupiter.api.Assertions.assertEquals; +import datadog.context.ContextScope; import datadog.trace.api.DDSpanId; import datadog.trace.api.DDTraceId; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.core.DDSpanContext; import datadog.trace.test.junit.utils.converter.PrioritySamplingConverter; @@ -130,7 +130,7 @@ void updateLastParentIdOnChildSpan() { // injecting root span context AgentSpan rootSpan = this.tracer.startSpan("test", "root"); long rootSpanId = rootSpan.getSpanId(); - AgentScope rootScope = this.tracer.activateSpan(rootSpan); + ContextScope rootScope = this.tracer.activateSpan(rootSpan); this.injector.inject((DDSpanContext) rootSpan.spanContext(), carrier, Map::put); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java index 576864a43e5..c73471994df 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/IterationSpansForkedTest.java @@ -7,8 +7,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; +import datadog.context.ContextScope; import datadog.metrics.api.statsd.StatsDClient; -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; @@ -44,32 +44,32 @@ void cleanup() throws Exception { void rootIterationScopeLifecycle() throws Exception { tracer.closePrevious(true); AgentSpan span1 = tracer.buildSpan("datadog", "next1").start(); - AgentScope scope1 = tracer.activateNext(span1); + ContextScope scope1 = tracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, tracer.activeSpan()); assertFalse(spanFinished(span1)); tracer.closePrevious(true); AgentSpan span2 = tracer.buildSpan("datadog", "next2").start(); - AgentScope scope2 = tracer.activateNext(span2); + ContextScope scope2 = tracer.activateNext(span2); assertTrue(spanFinished(span1)); assertEquals(1, writer.size()); assertSame(span1, writer.get(0).get(0)); - assertSame(span2, scope2.span()); + assertSame(span2, AgentSpan.fromScope(scope2)); assertSame(span2, tracer.activeSpan()); assertFalse(spanFinished(span2)); tracer.closePrevious(true); AgentSpan span3 = tracer.buildSpan("datadog", "next3").start(); - AgentScope scope3 = tracer.activateNext(span3); + ContextScope scope3 = tracer.activateNext(span3); writer.waitForTraces(2); assertTrue(spanFinished(span2)); assertEquals(2, writer.size()); - assertSame(span3, scope3.span()); + assertSame(span3, AgentSpan.fromScope(scope3)); assertSame(span3, tracer.activeSpan()); assertFalse(spanFinished(span3)); @@ -84,34 +84,34 @@ void rootIterationScopeLifecycle() throws Exception { @Test void nonRootIterationScopeLifecycle() throws Exception { AgentSpan span0 = tracer.buildSpan("datadog", "parent").start(); - AgentScope scope0 = tracer.activateSpan(span0); + ContextScope scope0 = tracer.activateSpan(span0); tracer.closePrevious(true); AgentSpan span1 = tracer.buildSpan("datadog", "next1").start(); - AgentScope scope1 = tracer.activateNext(span1); + ContextScope scope1 = tracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, tracer.activeSpan()); assertFalse(spanFinished(span1)); tracer.closePrevious(true); AgentSpan span2 = tracer.buildSpan("datadog", "next2").start(); - AgentScope scope2 = tracer.activateNext(span2); + ContextScope scope2 = tracer.activateNext(span2); assertTrue(spanFinished(span1)); assertTrue(writer.isEmpty()); - assertSame(span2, scope2.span()); + assertSame(span2, AgentSpan.fromScope(scope2)); assertSame(span2, tracer.activeSpan()); assertFalse(spanFinished(span2)); tracer.closePrevious(true); AgentSpan span3 = tracer.buildSpan("datadog", "next3").start(); - AgentScope scope3 = tracer.activateNext(span3); + ContextScope scope3 = tracer.activateNext(span3); assertTrue(spanFinished(span2)); assertTrue(writer.isEmpty()); - assertSame(span3, scope3.span()); + assertSame(span3, AgentSpan.fromScope(scope3)); assertSame(span3, tracer.activeSpan()); assertFalse(spanFinished(span3)); @@ -136,33 +136,33 @@ void nonRootIterationScopeLifecycle() throws Exception { void nestedIterationScopeLifecycle() throws Exception { tracer.closePrevious(true); AgentSpan span1 = tracer.buildSpan("datadog", "next").start(); - AgentScope scope1 = tracer.activateNext(span1); + ContextScope scope1 = tracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, tracer.activeSpan()); assertFalse(spanFinished(span1)); AgentSpan span1A = tracer.buildSpan("datadog", "method").start(); - AgentScope scope1A = tracer.activateSpan(span1A); + ContextScope scope1A = tracer.activateSpan(span1A); tracer.closePrevious(true); AgentSpan span1A1 = tracer.buildSpan("datadog", "next").start(); - AgentScope scope1A1 = tracer.activateNext(span1A1); + ContextScope scope1A1 = tracer.activateNext(span1A1); assertFalse(spanFinished(span1)); assertTrue(writer.isEmpty()); - assertSame(span1A1, scope1A1.span()); + assertSame(span1A1, AgentSpan.fromScope(scope1A1)); assertSame(span1A1, tracer.activeSpan()); assertFalse(spanFinished(span1A1)); tracer.closePrevious(true); AgentSpan span1A2 = tracer.buildSpan("datadog", "next").start(); - AgentScope scope1A2 = tracer.activateNext(span1A2); + ContextScope scope1A2 = tracer.activateNext(span1A2); assertTrue(spanFinished(span1A1)); assertTrue(writer.isEmpty()); - assertSame(span1A2, scope1A2.span()); + assertSame(span1A2, AgentSpan.fromScope(scope1A2)); assertSame(span1A2, tracer.activeSpan()); assertFalse(spanFinished(span1A2)); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java index fbf129c6ab8..02b1ae943ed 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerDepthTest.java @@ -4,8 +4,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertInstanceOf; +import datadog.context.ContextScope; import datadog.trace.api.config.TracerConfig; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.NoopScope; import datadog.trace.common.writer.ListWriter; @@ -26,7 +26,7 @@ void scopeManagerReturnsNoopScopeIfDepthExceeded() { ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer); // fill up the scope stack - AgentScope scope = null; + ContextScope scope = null; for (int i = 0; i < depth; i++) { AgentSpan testSpan = tracer.buildSpan("test", "test").start(); scope = tracer.activateSpan(testSpan); @@ -66,7 +66,7 @@ void scopeManagerIgnoresDepthLimitWhenZero() { ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer); // fill up the scope stack - AgentScope scope = null; + ContextScope scope = null; for (int i = 0; i < defaultLimit; i++) { AgentSpan testSpan = tracer.buildSpan("test", "test").start(); scope = tracer.activateSpan(testSpan); @@ -106,10 +106,10 @@ void depthIsCorrectlyUpdatedWithOutOfOrderClosing() { ContinuableScopeManager scopeManager = ScopeManagerTestBridge.getScopeManager(tracer); AgentSpan firstSpan = tracer.buildSpan("test", "foo").start(); - AgentScope firstScope = tracer.activateSpan(firstSpan); + ContextScope firstScope = tracer.activateSpan(firstSpan); AgentSpan secondSpan = tracer.buildSpan("test", "foo").start(); - AgentScope secondScope = tracer.activateSpan(secondSpan); + ContextScope secondScope = tracer.activateSpan(secondSpan); assertEquals(2, scopeManager.scopeStack().depth()); diff --git a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java index dc683942549..78dbe9d3a7c 100644 --- a/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/core/scopemanager/ScopeManagerForkedTest.java @@ -33,7 +33,6 @@ import datadog.trace.api.interceptor.TraceInterceptor; import datadog.trace.api.scopemanager.ExtendedScopeListener; import datadog.trace.api.scopemanager.ScopeListener; -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.ProfilingContextIntegration; @@ -114,7 +113,7 @@ void cleanup() { @Test void nonDdspanActivationResultsInAContinuableScope() { - AgentScope scope = scopeManager.activateSpan(noopSpan()); + ContextScope scope = scopeManager.activateSpan(noopSpan()); assertSame(scope, scopeManager.active()); assertInstanceOf(ContinuableScope.class, scope); @@ -135,65 +134,65 @@ void noScopeIsActiveBeforeActivation() throws Exception { @Test void simpleScopeAndSpanLifecycle() throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); - assertSame(span, scope.span()); - assertFalse(spanFinished(scope.span())); + assertSame(span, AgentSpan.fromScope(scope)); + assertFalse(spanFinished(AgentSpan.fromScope(scope))); assertSame(scope, scopeManager.active()); assertInstanceOf(ContinuableScope.class, scope); assertTrue(writer.isEmpty()); scope.close(); - assertFalse(spanFinished(scope.span())); + assertFalse(spanFinished(AgentSpan.fromScope(scope))); assertTrue(writer.isEmpty()); assertNull(scopeManager.active()); span.finish(); writer.waitForTraces(1); - assertTrue(spanFinished(scope.span())); + assertTrue(spanFinished(AgentSpan.fromScope(scope))); assertEquals(1, writer.size()); - assertSame(scope.span(), writer.get(0).get(0)); + assertSame(AgentSpan.fromScope(scope), writer.get(0).get(0)); assertNull(scopeManager.active()); } @Test void setsParentAsCurrentUponClose() { AgentSpan parentSpan = tracer.buildSpan("test", "parent").start(); - AgentScope parentScope = tracer.activateSpan(parentSpan); + ContextScope parentScope = tracer.activateSpan(parentSpan); AgentSpan childSpan = tracer.buildSpan("test", "child").start(); - AgentScope childScope = tracer.activateSpan(childSpan); + ContextScope childScope = tracer.activateSpan(childSpan); assertSame(childScope, scopeManager.active()); assertEquals( - parentScope.span().spanContext().getSpanId(), - ((DDSpan) childScope.span()).spanContext().getParentId()); + AgentSpan.fromScope(parentScope).spanContext().getSpanId(), + ((DDSpan) AgentSpan.fromScope(childScope)).spanContext().getParentId()); assertSame( - parentScope.span().spanContext().getTraceCollector(), - childScope.span().spanContext().getTraceCollector()); + AgentSpan.fromScope(parentScope).spanContext().getTraceCollector(), + AgentSpan.fromScope(childScope).spanContext().getTraceCollector()); childScope.close(); assertSame(parentScope, scopeManager.active()); - assertFalse(spanFinished(childScope.span())); - assertFalse(spanFinished(parentScope.span())); + assertFalse(spanFinished(AgentSpan.fromScope(childScope))); + assertFalse(spanFinished(AgentSpan.fromScope(parentScope))); assertTrue(writer.isEmpty()); } @Test void setsParentAsCurrentUponCloseWithNoopChild() { AgentSpan parentSpan = tracer.buildSpan("test", "parent").start(); - AgentScope parentScope = tracer.activateSpan(parentSpan); + ContextScope parentScope = tracer.activateSpan(parentSpan); AgentSpan childSpan = noopSpan(); - AgentScope childScope = tracer.activateSpan(childSpan); + ContextScope childScope = tracer.activateSpan(childSpan); assertSame(childScope, scopeManager.active()); childScope.close(); assertSame(parentScope, scopeManager.active()); - assertFalse(spanFinished(parentScope.span())); + assertFalse(spanFinished(AgentSpan.fromScope(parentScope))); assertTrue(writer.isEmpty()); } @@ -218,7 +217,7 @@ void ddScopeCreatesNoOpContinuationsWhenPropagationIsNotSet() { @Test void continuationCancelDoesNotCloseParentScope() { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); assertNotNull(continuation); @@ -232,7 +231,7 @@ void continuationCancelDoesNotCloseParentScope() { @Test void testContinuationDoesNotHaveHardReferenceOnScope() throws InterruptedException { AgentSpan span = tracer.buildSpan("test", "test").start(); - AtomicReference scopeRef = new AtomicReference<>(tracer.activateSpan(span)); + AtomicReference scopeRef = new AtomicReference<>(tracer.activateSpan(span)); ContextContinuation continuation = Context.current().capture(); assertNotNull(continuation); @@ -241,7 +240,7 @@ void testContinuationDoesNotHaveHardReferenceOnScope() throws InterruptedExcepti assertNull(scopeManager.active()); - WeakReference ref = new WeakReference<>(scopeRef.get()); + WeakReference ref = new WeakReference<>(scopeRef.get()); scopeRef.set(null); awaitGC(ref); @@ -256,7 +255,7 @@ void testContinuationDoesNotHaveHardReferenceOnScope() throws InterruptedExcepti void hardReferenceOnContinuationDoesNotPreventTraceFromReporting(boolean autoClose) throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); assertNotNull(continuation); @@ -279,9 +278,9 @@ void hardReferenceOnContinuationDoesNotPreventTraceFromReporting(boolean autoClo @Test void continuationRestoresTrace() throws Exception { AgentSpan parentSpan = tracer.buildSpan("test", "parent").start(); - AgentScope parentScope = tracer.activateSpan(parentSpan); + ContextScope parentScope = tracer.activateSpan(parentSpan); AgentSpan childSpan = tracer.buildSpan("test", "child").start(); - AgentScope childScope = tracer.activateSpan(childSpan); + ContextScope childScope = tracer.activateSpan(childSpan); ContextContinuation continuation = Context.current().capture(); childScope.close(); @@ -334,7 +333,7 @@ void continuationRestoresTrace() throws Exception { void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exception { // creating and activating a continuation AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); scope.close(); span.finish(); @@ -350,7 +349,7 @@ void continuationAllowsAddingSpansEvenAfterOtherSpansWereCompleted() throws Exce // creating a new child span under a continued scope AgentSpan childSpan = tracer.buildSpan("test", "child").start(); - AgentScope childScope = tracer.activateSpan(childSpan); + ContextScope childScope = tracer.activateSpan(childSpan); childScope.close(); childSpan.finish(); @@ -374,13 +373,13 @@ void testActivatingSameSpanMultipleTimes() { when(profilingContext.newScopeState(any())).thenReturn(localState); clearInvocations(profilingContext); - AgentScope scope1 = scopeManager.activateSpan(span); + ContextScope scope1 = scopeManager.activateSpan(span); assertEvents(Arrays.asList(ACTIVATE)); verify(profilingContext, times(1)).newScopeState(any()); clearInvocations(profilingContext); - AgentScope scope2 = scopeManager.activateSpan(span); + ContextScope scope2 = scopeManager.activateSpan(span); // Activating the same span multiple times does not create a new scope assertEvents(Arrays.asList(ACTIVATE)); @@ -403,13 +402,13 @@ void testActivatingSameSpanMultipleTimes() { @Test void openingAndClosingMultipleScopes() { AgentSpan span = tracer.buildSpan("test", "foo").start(); - AgentScope continuableScope = tracer.activateSpan(span); + ContextScope continuableScope = tracer.activateSpan(span); assertInstanceOf(ContinuableScope.class, continuableScope); assertEvents(Arrays.asList(ACTIVATE)); AgentSpan childSpan = tracer.buildSpan("test", "foo").start(); - AgentScope childDDScope = tracer.activateSpan(childSpan); + ContextScope childDDScope = tracer.activateSpan(childSpan); assertInstanceOf(ContinuableScope.class, childDDScope); assertEvents(Arrays.asList(ACTIVATE, ACTIVATE)); @@ -428,10 +427,10 @@ void openingAndClosingMultipleScopes() { @Test void closingScopeOutOfOrderSimple() { AgentSpan firstSpan = tracer.buildSpan("test", "foo").start(); - AgentScope firstScope = tracer.activateSpan(firstSpan); + ContextScope firstScope = tracer.activateSpan(firstSpan); AgentSpan secondSpan = tracer.buildSpan("test", "bar").start(); - AgentScope secondScope = tracer.activateSpan(secondSpan); + ContextScope secondScope = tracer.activateSpan(secondSpan); firstSpan.finish(); firstScope.close(); @@ -465,7 +464,7 @@ void closingScopeOutOfOrderComplex() { // scopeManager.active() or tracer.activeSpan() doesn't change the count AgentSpan firstSpan = tracer.buildSpan("test", "foo").start(); - AgentScope firstScope = tracer.activateSpan(firstSpan); + ContextScope firstScope = tracer.activateSpan(firstSpan); assertEvents(Arrays.asList(ACTIVATE)); assertSame(firstSpan, tracer.activeSpan()); @@ -479,7 +478,7 @@ void closingScopeOutOfOrderComplex() { clearInvocations(profilingContext); AgentSpan secondSpan = tracer.buildSpan("test", "bar").start(); - AgentScope secondScope = tracer.activateSpan(secondSpan); + ContextScope secondScope = tracer.activateSpan(secondSpan); assertEvents(Arrays.asList(ACTIVATE, ACTIVATE)); assertSame(secondSpan, tracer.activeSpan()); @@ -491,7 +490,7 @@ void closingScopeOutOfOrderComplex() { clearInvocations(profilingContext); AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start(); - AgentScope thirdScope = tracer.activateSpan(thirdSpan); + ContextScope thirdScope = tracer.activateSpan(thirdSpan); assertEvents(Arrays.asList(ACTIVATE, ACTIVATE, ACTIVATE)); assertSame(thirdSpan, tracer.activeSpan()); @@ -534,18 +533,18 @@ void closingScopeOutOfOrderMultipleActivations() { AgentSpan span = tracer.buildSpan("test", "test").start(); clearInvocations(profilingContext); - AgentScope scope1 = scopeManager.activateSpan(span); + ContextScope scope1 = scopeManager.activateSpan(span); assertEvents(Arrays.asList(ACTIVATE)); - AgentScope scope2 = scopeManager.activateSpan(span); + ContextScope scope2 = scopeManager.activateSpan(span); // Activating the same span multiple times does not create a new scope assertEvents(Arrays.asList(ACTIVATE)); clearInvocations(profilingContext); AgentSpan thirdSpan = tracer.buildSpan("test", "quux").start(); - AgentScope thirdScope = tracer.activateSpan(thirdSpan); + ContextScope thirdScope = tracer.activateSpan(thirdSpan); assertEvents(Arrays.asList(ACTIVATE, ACTIVATE)); assertSame(thirdSpan, tracer.activeSpan()); @@ -579,7 +578,7 @@ void closingScopeOutOfOrderMultipleActivations() { @Test void closingAContinuedScopeOutOfOrderCancelsTheContinuation() throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); scope.close(); span.finish(); @@ -591,7 +590,7 @@ void closingAContinuedScopeOutOfOrderCancelsTheContinuation() throws Exception { ContextScope continuedScope = continuation.resume(); AgentSpan secondSpan = tracer.buildSpan("test", "test2").start(); - AgentScope secondScope = (ContinuableScope) tracer.activateSpan(secondSpan); + ContextScope secondScope = (ContinuableScope) tracer.activateSpan(secondSpan); assertSame(secondScope, scopeManager.active()); @@ -614,7 +613,7 @@ void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throw tracer.addTraceInterceptor(interceptor); AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); scope.close(); span.finish(); @@ -630,7 +629,7 @@ void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throw // completing another scope lifecycle AgentSpan span2 = tracer.buildSpan("test", "test").start(); - AgentScope scope2 = tracer.activateSpan(span2); + ContextScope scope2 = tracer.activateSpan(span2); assertSame(scope2, scopeManager.active()); @@ -655,7 +654,7 @@ void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throw tracer.addTraceInterceptor(interceptor); AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); scope.close(); span.finish(); @@ -680,7 +679,7 @@ void exceptionThrownInTraceInterceptorDoesNotLeaveScopeManagerInBadState() throw // completing another async scope lifecycle AgentSpan span2 = tracer.buildSpan("test", "test").start(); - AgentScope scope2 = tracer.activateSpan(span2); + ContextScope scope2 = tracer.activateSpan(span2); ContextContinuation continuation2 = Context.current().capture(); assertNotNull(continuation2); @@ -706,7 +705,7 @@ void continuationCanBeActivatedAndClosedInMultipleThreads() throws Throwable { AgentSpan span = tracer.buildSpan("test", "test").start(); long start = System.nanoTime(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); AtomicReference continuation = new AtomicReference<>(Context.current().capture()); scope.close(); @@ -749,7 +748,7 @@ void continuationCanBeActivatedAndClosedInMultipleThreads() throws Throwable { void scopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = scopeManager.activateSpan(span); + ContextScope scope = scopeManager.activateSpan(span); assertEvents(Arrays.asList(ACTIVATE)); @@ -771,7 +770,7 @@ void scopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() { void extendedScopeListenerShouldBeNotifiedAboutTheCurrentlyActiveScope() { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = scopeManager.activateSpan(span); + ContextScope scope = scopeManager.activateSpan(span); assertEvents(Arrays.asList(ACTIVATE)); @@ -819,13 +818,13 @@ void misbehavingScopeListenerShouldNotAffectOthers( scopeManager.addScopeListener(secondEventCountingListener); AgentSpan span = tracer.buildSpan("test", "foo").start(); - AgentScope continuableScope = tracer.activateSpan(span); + ContextScope continuableScope = tracer.activateSpan(span); assertEvents(Arrays.asList(ACTIVATE)); assertEquals(Arrays.asList(ACTIVATE), secondEventCountingListener.events); AgentSpan childSpan = tracer.buildSpan("test", "foo").start(); - AgentScope childDDScope = tracer.activateSpan(childSpan); + ContextScope childDDScope = tracer.activateSpan(childSpan); assertEvents(Arrays.asList(ACTIVATE, ACTIVATE)); assertEquals(Arrays.asList(ACTIVATE, ACTIVATE), secondEventCountingListener.events); @@ -866,9 +865,9 @@ void contextThreadListenerNotifiedWhenScopeActivatedOnThreadForTheFirstTime() th futures[i] = executor.submit( () -> { - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); AgentSpan child = tracer.buildSpan("test", "foo" + taskIndex).start(); - AgentScope childScope = tracer.activateSpan(child); + ContextScope childScope = tracer.activateSpan(child); try { Thread.sleep(100); } catch (InterruptedException ignored) { @@ -900,7 +899,7 @@ void activatingASpanMergesItWithExistingContext() { assertNull(scopeManager.activeSpan()); assertEquals("test-value", scopeManager.currentContext().get(testKey)); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); assertSame(scope, scopeManager.active()); assertNotEquals(context, scopeManager.currentContext()); @@ -1087,7 +1086,7 @@ void contextsCanBeSwappedOutAndBack() { @Test void captureViaContextContinuationAPIHoldsTrace() throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); // Context.current().capture() routes through ContinuableScopeManager.capture(Context) ContextContinuation continuation = Context.current().capture(); @@ -1104,7 +1103,7 @@ void captureViaContextContinuationAPIHoldsTrace() throws Exception { @Test void continuationResumeActivatesSpan() throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); scope.close(); span.finish(); @@ -1114,7 +1113,7 @@ void continuationResumeActivatesSpan() throws Exception { // resume() delegates to activate() ContextScope resumedScope = continuation.resume(); - assertSame(span, scopeManager.active().span()); + assertSame(span, AgentSpan.fromScope(scopeManager.active())); resumedScope.close(); assertNull(scopeManager.active()); @@ -1125,7 +1124,7 @@ void continuationResumeActivatesSpan() throws Exception { @Test void continuationReleaseIsSameAsCancel() throws Exception { AgentSpan span = tracer.buildSpan("test", "test").start(); - AgentScope scope = tracer.activateSpan(span); + ContextScope scope = tracer.activateSpan(span); ContextContinuation continuation = Context.current().capture(); scope.close(); span.finish(); 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 cf049fcf7ad..e3104df0db5 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 @@ -73,6 +73,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.EnumSource; import org.junit.jupiter.params.provider.ValueSource; class LambdaAppSecHandlerTest extends DDCoreJavaSpecification { @@ -1737,7 +1738,7 @@ void processResponseDataSkipsNonApiGwResponseWhenTriggerTypeIsUnknown() { @Test @SuppressWarnings("unchecked") - void processResponseDataAppliesFallbackForHttpTriggerWithPlainJsonResponse() { + void processResponseDataInfersSuccessForFunctionUrlPlainJsonResponse() { LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.LAMBDA_URL); ByteArrayOutputStream result = createOutputStream("{\"result\": \"hello\"}"); Integer[] capturedStatus = {null}; @@ -1751,7 +1752,9 @@ void processResponseDataAppliesFallbackForHttpTriggerWithPlainJsonResponse() { () -> headerDoneCalled[0] = true, body -> capturedBody[0] = body); LambdaAppSecHandler.processResponseData(span, result); - assertNull(capturedStatus[0]); + assertEquals(200, capturedStatus[0]); + verify(span).setHttpStatusCode(200); + verify(span).setError(false, ErrorPriorities.HTTP_SERVER_DECORATOR); assertEquals("application/json", capturedHeaders.get("content-type")); assertTrue(headerDoneCalled[0]); assertInstanceOf(Map.class, capturedBody[0]); @@ -1759,14 +1762,33 @@ void processResponseDataAppliesFallbackForHttpTriggerWithPlainJsonResponse() { } @Test + void processResponseDataInfersSuccessForHttpApiV2JsonStringResponse() { + LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP); + ByteArrayOutputStream result = createOutputStream("\"Hello World!\""); + Integer[] capturedStatus = {null}; + Object[] capturedBody = {null}; + AgentSpan span = + setupMockResponseCallbacks( + status -> capturedStatus[0] = status, null, null, body -> capturedBody[0] = body); + + LambdaAppSecHandler.processResponseData(span, result); + + assertEquals(200, capturedStatus[0]); + assertEquals("Hello World!", capturedBody[0]); + } + + @ParameterizedTest + @ValueSource(ints = {0, -1}) @SuppressWarnings("unchecked") - void processResponseDataKeepsParsedHeadersAndBodyWhenStatusCodeIsZero() { - // A response that has statusCode:0 with explicit headers/body should use the parsed data, - // not discard it in favour of the plain-response fallback. - LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST); + void processResponseDataKeepsParsedDataWithoutStartingNonPositiveStatus(int statusCode) { + // An explicit non-positive status with headers/body should use the parsed data without + // publishing the unusable status. + LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP); ByteArrayOutputStream result = createOutputStream( - "{\"statusCode\": 0, \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"hello\"}"); + "{\"statusCode\": " + + statusCode + + ", \"headers\": {\"content-type\": \"text/plain\"}, \"body\": \"hello\"}"); Integer[] capturedStatus = {null}; Map capturedHeaders = new HashMap<>(); boolean[] headerDoneCalled = {false}; @@ -1778,12 +1800,80 @@ void processResponseDataKeepsParsedHeadersAndBodyWhenStatusCodeIsZero() { () -> headerDoneCalled[0] = true, body -> capturedBody[0] = body); LambdaAppSecHandler.processResponseData(span, result); - assertNull(capturedStatus[0]); // statusCode 0 — responseStarted not fired + assertNull(capturedStatus[0]); + verify(span, never()).setHttpStatusCode(anyInt()); assertEquals("text/plain", capturedHeaders.get("content-type")); // parsed header kept assertTrue(headerDoneCalled[0]); assertEquals("hello", capturedBody[0]); // parsed body kept, not the whole envelope } + @ParameterizedTest + @EnumSource( + value = LambdaTriggerType.class, + names = {"API_GATEWAY_V2_HTTP", "LAMBDA_URL"}) + void processResponseDataTreatsProxyShapedResponseWithoutStatusCodeAsImplicitSuccess( + LambdaTriggerType triggerType) { + // Without a statusCode key the gateway does not interpret headers/body/isBase64Encoded at all: + // it serialises the whole object as the body of a 200 response with content-type + // application/json, so the declared text/html and the base64 encoding never reach the client. + LambdaAppSecHandler.setCurrentTriggerType(triggerType); + ByteArrayOutputStream result = + createOutputStream( + "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}"); + Integer[] capturedStatus = {null}; + Map capturedHeaders = new HashMap<>(); + Object[] capturedBody = {null}; + AgentSpan span = + setupMockResponseCallbacks( + status -> capturedStatus[0] = status, + capturedHeaders::put, + null, + body -> capturedBody[0] = body); + + LambdaAppSecHandler.processResponseData(span, result); + + assertEquals(200, capturedStatus[0]); + verify(span).setHttpStatusCode(200); + assertEquals(1, capturedHeaders.size()); + assertEquals("application/json", capturedHeaders.get("content-type")); + assertInstanceOf(Map.class, capturedBody[0]); + Map envelope = (Map) capturedBody[0]; + // the whole envelope is the body, and its body field stays base64-encoded + assertEquals("PGgxPmhpPC9oMT4=", envelope.get("body")); + assertInstanceOf(Map.class, envelope.get("headers")); + } + + @ParameterizedTest + @EnumSource( + value = LambdaTriggerType.class, + names = {"API_GATEWAY_V1_REST", "ALB", "ALB_MULTI_VALUE", "API_GATEWAY_V2_WEBSOCKET"}) + void processResponseDataHonoursAnEnvelopeWithoutStatusCodeOnProxyTriggers( + LambdaTriggerType triggerType) { + // The mirror of the implicit-success case: these triggers never infer a 200, so the envelope + // is still interpreted — the declared content type and the decoded body are what the client + // gets — and only the status stays unknown. + LambdaAppSecHandler.setCurrentTriggerType(triggerType); + ByteArrayOutputStream result = + createOutputStream( + "{\"headers\": {\"content-type\": \"text/html\"}, \"body\": \"PGgxPmhpPC9oMT4=\", \"isBase64Encoded\": true}"); + Integer[] capturedStatus = {null}; + Map capturedHeaders = new HashMap<>(); + Object[] capturedBody = {null}; + AgentSpan span = + setupMockResponseCallbacks( + status -> capturedStatus[0] = status, + capturedHeaders::put, + null, + body -> capturedBody[0] = body); + + LambdaAppSecHandler.processResponseData(span, result); + + assertNull(capturedStatus[0]); + verify(span, never()).setHttpStatusCode(anyInt()); + assertEquals("text/html", capturedHeaders.get("content-type")); + assertEquals("

hi

", capturedBody[0]); + } + @Test void processResponseDataAppliesFallbackForHttpTriggerWithNonJsonStringResponse() { LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST); @@ -1876,8 +1966,12 @@ void processResponseDataExtractsStatusCodeAsIntegerFromDouble() { assertEquals(404, capturedStatus[0]); } - @Test - void processResponseDataHandlesMissingStatusCode() { + @ParameterizedTest + @EnumSource( + value = LambdaTriggerType.class, + names = {"API_GATEWAY_V1_REST", "API_GATEWAY_V2_WEBSOCKET", "ALB", "ALB_MULTI_VALUE"}) + void processResponseDataDoesNotInferStatusForProxyTriggers(LambdaTriggerType triggerType) { + LambdaAppSecHandler.setCurrentTriggerType(triggerType); ByteArrayOutputStream result = createOutputStream("{\"body\": \"ok\"}"); Integer[] capturedStatus = {null}; AgentSpan span = @@ -1888,6 +1982,7 @@ void processResponseDataHandlesMissingStatusCode() { @Test void processResponseDataHandlesNonNumericStatusCode() { + LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP); ByteArrayOutputStream result = createOutputStream("{\"statusCode\": \"bad\", \"body\": \"ok\"}"); Integer[] capturedStatus = {null}; @@ -1895,6 +1990,7 @@ void processResponseDataHandlesNonNumericStatusCode() { setupMockResponseCallbacks(status -> capturedStatus[0] = status, null, null, null); LambdaAppSecHandler.processResponseData(span, result); assertNull(capturedStatus[0]); + verify(span, never()).setHttpStatusCode(anyInt()); } // --- Header extraction --- @@ -2131,6 +2227,7 @@ void processResponseDataMultiValueHeadersOverrideSingleValueHeaders() { @Test void processResponseDataHandlesMalformedJsonResponse() { + LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V2_HTTP); ByteArrayOutputStream result = createOutputStream("{not valid json"); Integer[] capturedStatus = {null}; AgentSpan span = @@ -2200,19 +2297,25 @@ void processResponseDataSkipsResponseHeaderWhenCallbackIsNull() { // extractResponseData Unit Tests // ============================================================================ - @Test - void extractResponseDataReturnsNullForMalformedJson() { - assertNull(parseResponse("{bad json")); - } + @ParameterizedTest(name = "[{index}] {0}") + @ValueSource(strings = {"{bad json", ""}) + void reportsUnparseablePayloadAsTextWithoutAStatus(String json) { + // The payload is not JSON at all, so it is not a valid response for any HTTP trigger: the + // gateway substitutes its own error and the status is not knowable here. + LambdaResponseData response = parseResponse(json, LambdaTriggerType.API_GATEWAY_V1_REST); - @Test - void extractResponseDataReturnsNullForNullJsonParseResult() { - assertNull(parseResponse("null")); + assertNull(response.statusCode); + assertEquals(singletonMap("content-type", "text/plain"), response.headers); + assertEquals(json, response.body); } @Test - void extractResponseDataReturnsNullForEmptyString() { - assertNull(parseResponse("")); + void extractResponseDataPreservesJsonNullAsAValidPlainResponse() { + LambdaResponseData response = parseResponse("null", LambdaTriggerType.API_GATEWAY_V1_REST); + + assertNull(response.statusCode); + assertEquals(singletonMap("content-type", "application/json"), response.headers); + assertNull(response.body); } @ParameterizedTest(name = "[{index}] content-type {0}") @@ -2224,8 +2327,9 @@ void parsesAResponseBodyAsJsonWhenTheContentTypeIsBlankOrJson(String contentType parseResponse( "{\"statusCode\": 200, \"headers\": {\"content-type\": \"" + contentType - + "\"}, \"body\": \"{\\\"a\\\":1}\"}"); - assertNotNull(response); + + "\"}, \"body\": \"{\\\"a\\\":1}\"}", + LambdaTriggerType.API_GATEWAY_V1_REST); + assertEquals(singletonMap("a", 1.0), response.body); } @@ -2234,11 +2338,27 @@ void keepsAResponseBodyRawWhenTheContentTypeIsNotJson() { LambdaResponseData response = parseResponse( "{\"statusCode\": 200, \"headers\": {\"content-type\": \"text/plain\"}," - + " \"body\": \"{\\\"a\\\":1}\"}"); - assertNotNull(response); + + " \"body\": \"{\\\"a\\\":1}\"}", + LambdaTriggerType.API_GATEWAY_V1_REST); + assertEquals("{\"a\":1}", response.body); } + @Test + void distinguishesAbsentStatusCodeFromExplicitZero() { + // Absent: the gateway serialises the whole value as the body of a 200. Present: the payload is + // an envelope, so the status is kept as received and never defaulted. + LambdaResponseData absent = + parseResponse("{\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP); + LambdaResponseData explicitZero = + parseResponse("{\"statusCode\":0,\"body\":\"ok\"}", LambdaTriggerType.API_GATEWAY_V2_HTTP); + + assertEquals(200, absent.statusCode); + assertEquals(singletonMap("body", "ok"), absent.body); + assertEquals(0, explicitZero.statusCode); + assertEquals("ok", explicitZero.body); + } + // ============================================================================ // HTTP span tags // ============================================================================ @@ -2550,8 +2670,8 @@ void processResponseDataDoesNotFlagClientErrorStatusAsError() { } @Test - void processResponseDataLeavesHttpStatusCodeUnsetForNonApiGwResponse() { - LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.LAMBDA_URL); + void processResponseDataLeavesHttpStatusCodeUnsetForRestResponseWithoutStatus() { + LambdaAppSecHandler.setCurrentTriggerType(LambdaTriggerType.API_GATEWAY_V1_REST); AgentSpan span = setupMockResponseCallbacks(null, null, null, null); LambdaAppSecHandler.processResponseData(span, createOutputStream("{\"result\": \"hello\"}")); diff --git a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java index 909d94ed526..116ab73a7ad 100644 --- a/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java +++ b/dd-trace-core/src/test/java/datadog/trace/llmobs/writer/ddintake/LLMObsSpanMapperTest.java @@ -844,32 +844,37 @@ void testLLMObsSpanProcessorInputAndOutputRejectNull() { } @Test - void testLLMObsSpanMapperSerializesAgentManifest() throws Exception { + void testLLMObsSpanMapperSerializesNestedMetadata() throws Exception { LLMObsSpanMapper mapper = new LLMObsSpanMapper(); CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); + // The agent manifest reaches the mapper nested inside the metadata tag, under the reserved + // _dd namespace (see DDLLMObsSpan#annotateAgentManifest), and must survive as-is. + Map modelSettings = new LinkedHashMap<>(); + modelSettings.put("temperature", 0.7); + Map tool = new LinkedHashMap<>(); + tool.put("name", "get_weather"); + tool.put("description", "Look up the weather."); + Map manifest = new LinkedHashMap<>(); manifest.put("name", "travel_desk"); manifest.put("instructions", "Book travel."); manifest.put("model", "gpt-4o"); manifest.put("framework", "manual"); - - Map modelSettings = new LinkedHashMap<>(); - modelSettings.put("temperature", 0.7); manifest.put("model_settings", modelSettings); + manifest.put("tools", Collections.singletonList(tool)); - List> tools = new ArrayList<>(); - Map tool = new LinkedHashMap<>(); - tool.put("name", "get_weather"); - tool.put("description", "Look up the weather."); - tools.add(tool); - manifest.put("tools", tools); + Map dd = new LinkedHashMap<>(); + dd.put("agent_manifest", manifest); + Map metadataTag = new LinkedHashMap<>(); + metadataTag.put("tenant", "acme"); + metadataTag.put("_dd", dd); AgentSpan agentSpan = tracer .buildSpan("datadog", "my-agent") .withTag("_ml_obs_tag.span.kind", "agent") - .withTag("_ml_obs_tag.agent_manifest", manifest) + .withTag("_ml_obs_tag.metadata", metadataTag) .start(); agentSpan.setSpanType(InternalSpanTypes.LLMOBS); agentSpan.finish(); @@ -877,8 +882,15 @@ void testLLMObsSpanMapperSerializesAgentManifest() throws Exception { Map spanData = serializeSingleSpan(mapper, agentSpan); Map meta = (Map) spanData.get("meta"); - assertTrue(meta.containsKey("agent_manifest")); - Map gotManifest = (Map) meta.get("agent_manifest"); + // Never a top-level meta key, and never leaked into the tags array. + assertFalse(meta.containsKey("agent_manifest")); + List tags = (List) spanData.get("tags"); + assertFalse(tags.stream().anyMatch(t -> t.contains("agent_manifest"))); + + Map metadata = (Map) meta.get("metadata"); + assertEquals("acme", metadata.get("tenant")); + Map gotDd = (Map) metadata.get("_dd"); + Map gotManifest = (Map) gotDd.get("agent_manifest"); assertEquals("travel_desk", gotManifest.get("name")); assertEquals("Book travel.", gotManifest.get("instructions")); assertEquals("gpt-4o", gotManifest.get("model")); @@ -886,32 +898,7 @@ void testLLMObsSpanMapperSerializesAgentManifest() throws Exception { assertEquals(modelSettings, gotManifest.get("model_settings")); assertInstanceOf( Double.class, ((Map) gotManifest.get("model_settings")).get("temperature")); - assertEquals(tools, gotManifest.get("tools")); - - tracer.close(); - } - - @Test - void testAgentManifestDoesNotAppearInTags() throws Exception { - LLMObsSpanMapper mapper = new LLMObsSpanMapper(); - CoreTracer tracer = tracerBuilder().writer(new ListWriter()).build(); - - Map manifest = new LinkedHashMap<>(); - manifest.put("name", "my-agent"); - manifest.put("framework", "manual"); - - AgentSpan agentSpan = - tracer - .buildSpan("datadog", "my-agent") - .withTag("_ml_obs_tag.span.kind", "agent") - .withTag("_ml_obs_tag.agent_manifest", manifest) - .start(); - agentSpan.setSpanType(InternalSpanTypes.LLMOBS); - agentSpan.finish(); - - Map spanData = serializeSingleSpan(mapper, agentSpan); - List tags = (List) spanData.get("tags"); - assertFalse(tags.stream().anyMatch(t -> t.contains("agent_manifest"))); + assertEquals(Collections.singletonList(tool), gotManifest.get("tools")); tracer.close(); } diff --git a/dd-trace-ot/correlation-id-injection/gradle.lockfile b/dd-trace-ot/correlation-id-injection/gradle.lockfile index 91bb4c62dd3..7fd8cf6eaaa 100644 --- a/dd-trace-ot/correlation-id-injection/gradle.lockfile +++ b/dd-trace-ot/correlation-id-injection/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -100,7 +100,6 @@ 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.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/dd-trace-ot/gradle.lockfile b/dd-trace-ot/gradle.lockfile index 810930dedd4..688fc7fc64b 100644 --- a/dd-trace-ot/gradle.lockfile +++ b/dd-trace-ot/gradle.lockfile @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.auto.service:auto-service-annotations:1.1.1=annotationProcessor,compileClasspath,jmhCompileClasspath com.google.auto.service:auto-service:1.1.1=annotationProcessor @@ -112,7 +112,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,ot31Compatib org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,ot31CompatibilityTestCompileClasspath,ot31CompatibilityTestRuntimeClasspath,ot33CompatibilityTestCompileClasspath,ot33CompatibilityTestRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java b/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java index a620838b4e6..0aba3ac4c42 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/OTScopeManager.java @@ -1,7 +1,8 @@ package datadog.opentracing; +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; import datadog.trace.bootstrap.instrumentation.api.AgentTracer; import datadog.trace.context.TraceScope; @@ -35,7 +36,7 @@ public Scope activate(final Span span, final boolean finishSpanOnClose) { } final AgentSpan agentSpan = converter.toAgentSpan(span); - final AgentScope agentScope = tracer.activateManualSpan(agentSpan); + final ContextScope agentScope = tracer.activateManualSpan(agentSpan); return converter.toScope(agentScope, finishSpanOnClose); } @@ -57,12 +58,14 @@ public Span activeSpan() { } static class OTScope implements Scope, TraceScope { - private final AgentScope delegate; + private final ContextScope delegate; private final boolean finishSpanOnClose; private final TypeConverter converter; OTScope( - final AgentScope delegate, final boolean finishSpanOnClose, final TypeConverter converter) { + final ContextScope delegate, + final boolean finishSpanOnClose, + final TypeConverter converter) { this.delegate = delegate; this.finishSpanOnClose = finishSpanOnClose; this.converter = converter; @@ -73,13 +76,13 @@ public void close() { delegate.close(); if (finishSpanOnClose) { - delegate.span().finish(); + AgentSpan.fromScope(delegate).finish(); } } @Override public Span span() { - return converter.toSpan(delegate.span()); + return converter.toSpan(AgentSpan.fromScope(delegate)); } @Override @@ -91,12 +94,12 @@ public boolean equals(final Object o) { return false; } final OTScope otScope = (OTScope) o; - return delegate.span().equals(otScope.delegate.span()); + return AgentSpan.fromScope(delegate).equals(AgentSpan.fromScope(otScope.delegate)); } @Override public int hashCode() { - return delegate.span().hashCode(); + return AgentSpan.fromScope(delegate).hashCode(); } boolean isFinishSpanOnClose() { @@ -104,7 +107,7 @@ boolean isFinishSpanOnClose() { } } - private final class FakeScope implements AgentScope { + private final class FakeScope implements ContextScope { private final AgentSpan agentSpan; FakeScope(AgentSpan agentSpan) { @@ -112,7 +115,7 @@ private final class FakeScope implements AgentScope { } @Override - public AgentSpan span() { + public Context context() { return agentSpan; } diff --git a/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java b/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java index 2193eeee980..67e0f050b62 100644 --- a/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java +++ b/dd-trace-ot/src/main/java/datadog/opentracing/TypeConverter.java @@ -3,7 +3,7 @@ import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpan; import static datadog.trace.bootstrap.instrumentation.api.AgentTracer.noopSpanContext; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.bootstrap.instrumentation.api.AgentSpanContext; import datadog.trace.bootstrap.instrumentation.api.AttachableWrapper; @@ -54,7 +54,7 @@ public OTSpan toSpan(final AgentSpan agentSpan) { return new OTSpan(agentSpan, this, logHandler); } - public Scope toScope(final AgentScope scope, final boolean finishSpanOnClose) { + public Scope toScope(final ContextScope scope, final boolean finishSpanOnClose) { if (scope == null) { return null; } diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java index ac24833a82f..80a37398567 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/IterationSpansForkedTest.java @@ -6,8 +6,8 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.mockito.Mockito.mock; +import datadog.context.ContextScope; import datadog.metrics.api.statsd.StatsDClient; -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; @@ -48,32 +48,32 @@ void cleanup() throws Exception { void rootIterationScopeLifecycle() throws Exception { coreTracer.closePrevious(true); AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start(); - AgentScope scope1 = coreTracer.activateNext(span1); + ContextScope scope1 = coreTracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span1)); coreTracer.closePrevious(true); AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start(); - AgentScope scope2 = coreTracer.activateNext(span2); + ContextScope scope2 = coreTracer.activateNext(span2); assertTrue(spanFinished(span1)); assertEquals(1, writer.size()); assertSame(span1, writer.get(0).get(0)); - assertSame(span2, scope2.span()); + assertSame(span2, AgentSpan.fromScope(scope2)); assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span2)); coreTracer.closePrevious(true); AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start(); - AgentScope scope3 = coreTracer.activateNext(span3); + ContextScope scope3 = coreTracer.activateNext(span3); writer.waitForTraces(2); assertTrue(spanFinished(span2)); assertEquals(2, writer.size()); - assertSame(span3, scope3.span()); + assertSame(span3, AgentSpan.fromScope(scope3)); assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span3)); @@ -87,34 +87,34 @@ void rootIterationScopeLifecycle() throws Exception { @Test void nonRootIterationScopeLifecycle() throws Exception { AgentSpan span0 = coreTracer.buildSpan("datadog", "parent").start(); - AgentScope scope0 = coreTracer.activateSpan(span0); + ContextScope scope0 = coreTracer.activateSpan(span0); coreTracer.closePrevious(true); AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start(); - AgentScope scope1 = coreTracer.activateNext(span1); + ContextScope scope1 = coreTracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span1)); coreTracer.closePrevious(true); AgentSpan span2 = coreTracer.buildSpan("datadog", "next2").start(); - AgentScope scope2 = coreTracer.activateNext(span2); + ContextScope scope2 = coreTracer.activateNext(span2); assertTrue(spanFinished(span1)); assertTrue(writer.isEmpty()); - assertSame(span2, scope2.span()); + assertSame(span2, AgentSpan.fromScope(scope2)); assertSame(span2, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span2)); coreTracer.closePrevious(true); AgentSpan span3 = coreTracer.buildSpan("datadog", "next3").start(); - AgentScope scope3 = coreTracer.activateNext(span3); + ContextScope scope3 = coreTracer.activateNext(span3); assertTrue(spanFinished(span2)); assertTrue(writer.isEmpty()); - assertSame(span3, scope3.span()); + assertSame(span3, AgentSpan.fromScope(scope3)); assertSame(span3, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span3)); @@ -138,33 +138,33 @@ void nonRootIterationScopeLifecycle() throws Exception { void nestedIterationScopeLifecycle() throws Exception { coreTracer.closePrevious(true); AgentSpan span1 = coreTracer.buildSpan("datadog", "next1").start(); - AgentScope scope1 = coreTracer.activateNext(span1); + ContextScope scope1 = coreTracer.activateNext(span1); assertTrue(writer.isEmpty()); - assertSame(span1, scope1.span()); + assertSame(span1, AgentSpan.fromScope(scope1)); assertSame(span1, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span1)); AgentSpan span1A = coreTracer.buildSpan("datadog", "methodA").start(); - AgentScope scope1A = coreTracer.activateSpan(span1A); + ContextScope scope1A = coreTracer.activateSpan(span1A); coreTracer.closePrevious(true); AgentSpan span1A1 = coreTracer.buildSpan("datadog", "next1A1").start(); - AgentScope scope1A1 = coreTracer.activateNext(span1A1); + ContextScope scope1A1 = coreTracer.activateNext(span1A1); assertFalse(spanFinished(span1)); assertTrue(writer.isEmpty()); - assertSame(span1A1, scope1A1.span()); + assertSame(span1A1, AgentSpan.fromScope(scope1A1)); assertSame(span1A1, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span1A1)); coreTracer.closePrevious(true); AgentSpan span1A2 = coreTracer.buildSpan("datadog", "next1A2").start(); - AgentScope scope1A2 = coreTracer.activateNext(span1A2); + ContextScope scope1A2 = coreTracer.activateNext(span1A2); assertTrue(spanFinished(span1A1)); assertTrue(writer.isEmpty()); - assertSame(span1A2, scope1A2.span()); + assertSame(span1A2, AgentSpan.fromScope(scope1A2)); assertSame(span1A2, ((OTSpan) tracer.activeSpan()).getDelegate()); assertFalse(spanFinished(span1A2)); diff --git a/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java b/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java index e506bc44616..7268378f451 100644 --- a/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java +++ b/dd-trace-ot/src/test/java/datadog/opentracing/TypeConverterTest.java @@ -7,7 +7,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import datadog.trace.bootstrap.instrumentation.api.AgentScope; +import datadog.context.ContextScope; import datadog.trace.bootstrap.instrumentation.api.AgentSpan; import datadog.trace.common.writer.ListWriter; import datadog.trace.core.CoreTracer; @@ -48,8 +48,8 @@ void shouldAvoidTheNoopContextWrapperAllocation() { @Test void shouldReuseNoopSpanWrapperViaScope() { - AgentScope noopScope = mock(AgentScope.class); - when(noopScope.span()).thenReturn(noopSpan()); + ContextScope noopScope = mock(ContextScope.class); + when(noopScope.context()).thenReturn(noopSpan()); OTSpan noopSpanWrapper = typeConverter.toSpan(noopSpan()); assertSame(typeConverter.toScope(noopScope, true).span(), noopSpanWrapper); assertSame(typeConverter.toScope(noopScope, false).span(), noopSpanWrapper); diff --git a/docs/add_new_instrumentation.md b/docs/add_new_instrumentation.md index 5ecf9c06db8..40d0c1d8f0b 100644 --- a/docs/add_new_instrumentation.md +++ b/docs/add_new_instrumentation.md @@ -286,13 +286,13 @@ public String[] helperClassNames() { reference which must be of the same `HttpRequest` type. 3. Add a parameter, `@Advice.Local("inherited") boolean inheritedScope`. This shared local variable will be visible to both `OnMethodEnter` and `OnMethodExit` methods. - 4. Use `activeScope()` __to __see if an `AgentScope` is already active. If so, return that `AgentScope`, but first + 4. Use `activeScope()` __to __see if a `ContextScope` is already active. If so, return that `ContextScope`, but first let the exit method know by setting the shared `inheritedScope` boolean. - 5. If an `AgentScope` was not active then start a new span, decorate it, activate it and return it. + 5. If a `ContextScope` was not active then start a new span, decorate it, activate it and return it. 4. With `methodExit:` 1. Annotate the method using `@Advice.OnMethodExit(onThrowable=Throwable.class, suppress=Throwable.class). `( see [Exceptions in Advice](./how_instrumentations_work.md#exceptions-in-advice)) - 2. Add parameter `@Advice.Enter AgentScope scope. `This is the `AgentScope` object returned earlier + 2. Add parameter `@Advice.Enter ContextScope scope. `This is the `ContextScope` object returned earlier by `methodEnter()`. Note this is not the return value of the target `execute()` method. 3. Add a parameter, `@Advice.Local("inherited") boolean inheritedScope`. This is the shared local variable created earlier. @@ -301,19 +301,19 @@ public String[] helperClassNames() { of `methodEnter()`.` ` 5. Add a parameter `@Advice.Thrown final Throwable throwable`. This makes available any exception thrown by the target `execute()` method. - 6. Use `scope.span() `to obtain the `AgentSpan` and decorate the span as needed. + 6. Use `Java8BytecodeBridge.spanFromScope(scope) `to obtain the `AgentSpan` and decorate the span as needed. 7. If the scope was just created (not inherited), close it. ```java public static class GoogleHttpClientAdvice { @Advice.OnMethodEnter(suppress = Throwable.class) - public static AgentScope methodEnter( + public static ContextScope methodEnter( @Advice.This HttpRequest request, @Advice.Local("inherited") boolean inheritedScope ) { - AgentScope scope = activeScope(); + ContextScope scope = activeScope(); if (null != scope) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); if (HTTP_REQUEST == span.getOperationName()) { inheritedScope = true; return scope; @@ -326,11 +326,11 @@ public static class GoogleHttpClientAdvice { @Advice.OnMethodExit(onThrowable = Throwable.class, suppress = Throwable.class) public static void methodExit( - @Advice.Enter AgentScope scope, + @Advice.Enter ContextScope scope, @Advice.Local("inherited") boolean inheritedScope, @Advice.Return final HttpResponse response, @Advice.Thrown final Throwable throwable) { - AgentSpan span = scope.span(); + AgentSpan span = spanFromScope(scope); DECORATE.onError(span, throwable); DECORATE.onResponse(span, response); DECORATE.beforeFinish(span); diff --git a/docs/how_instrumentations_work.md b/docs/how_instrumentations_work.md index bfe4e6232bb..97e97fa062a 100644 --- a/docs/how_instrumentations_work.md +++ b/docs/how_instrumentations_work.md @@ -788,25 +788,25 @@ The basic span lifecycle in an Advice class looks like: 1. Start the span 2. Decorate the span -3. Activate the span and get the AgentScope +3. Activate the span and get the ContextScope 4. Run the instrumented target method 5. While the scope is still active: call final decorator methods (`DECORATE.beforeFinish`, etc.) and register any async callbacks -6. Close the Agent Scope +6. Close the scope 7. Finish the span Step 5 must complete before step 6: `beforeFinish` fires IAST/AppSec request-end callbacks that resolve the current span via `AgentTracer.activeSpan()`, and async callback frameworks (e.g. `CompletableFuture`) capture the active span at registration time — both break if the scope is closed first. ```java @Advice.OnMethodEnter(suppress = Throwable.class) -public static AgentScope begin() { +public static ContextScope begin() { final AgentSpan span = startSpan(/* */); DECORATE.afterStart(span); return activateSpan(span); } @Advice.OnMethodExit(suppress = Throwable.class) -public static void end(@Advice.Enter final AgentScope scope) { - AgentSpan span = scope.span(); +public static void end(@Advice.Enter final ContextScope scope) { + AgentSpan span = spanFromScope(scope); DECORATE.beforeFinish(span); scope.close(); span.finish(); @@ -824,15 +824,15 @@ methods. ## Continuations -- [`AgentScope.Continuation`](https://github.com/DataDog/dd-trace-java/blob/09ac78ff0b54fbbbee0ab1c89c901d2043fda40b/dd-trace-api/src/main/java/datadog/trace/context/TraceScope.java#L47) +- [`ContextContinuation`](https://github.com/DataDog/dd-trace-java/blob/b1db32e43c88eeab3c734c1826753bbc6fae9975/components/context/src/main/java/datadog/context/ContextContinuation.java) is used to pass context between threads. -- Continuations must be either activated or canceled. -- If a Continuation is activated it returns a TraceScope which must eventually be closed. -- Only after all TraceScopes are closed and any non-activated Continuations are canceled may the Trace finally close. +- Continuations must be either resumed or released. +- If a Continuation is resumed it returns a `ContextScope` which must eventually be closed. +- Only after all scopes are closed and any non-resumed continuations are released may the Trace finally close. Notice in [`HttpClientRequestTracingHandler`](https://github.com/DataDog/dd-trace-java/blob/3fe1b2d6010e50f61518fa25af3bdeb03ae7712b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java#L56) -how the AgentScope.Continuation is used to obtain the `parentScope` which is +how the Continuation is used to obtain the `parentScope` which is finally [closed](https://github.com/DataDog/dd-trace-java/blob/3fe1b2d6010e50f61518fa25af3bdeb03ae7712b/dd-java-agent/instrumentation/netty-4.1/src/main/java/datadog/trace/instrumentation/netty41/client/HttpClientRequestTracingHandler.java#L111). ## Naming diff --git a/docs/how_to_test.md b/docs/how_to_test.md index d38986f8645..c0eb4b5288c 100644 --- a/docs/how_to_test.md +++ b/docs/how_to_test.md @@ -67,6 +67,8 @@ To run tests on a different JVM than the one used for the build, you can specify * `-PtestJvm=X` like `-PtestJvm=8`, `-PtestJvm=25` to run with a specific JDK version, * `-PtestJvm=/path/to/jdk` to run with a given JDK, +To also run CI tests on the additional vendor and pre-release JVMs, include the exact, case-sensitive `[ci: NON_DEFAULT_JVMS]` text in the commit message. + ### Running System Tests The system tests are setup to run on continuous integration (CI) as pull request check using [a dedicated workflow]((https://github.com/DataDog/system-tests/blob/main/.github/workflows/system-tests.yml)). @@ -85,3 +87,9 @@ The APM Test Agent also emits helpful logging, including logging received traces Logs can be viewed in GitLab within the Test-Agent container step for all instrumentation test suites, e.g. the `test_inst` jobs. Read more about [the APM Test Agent](https://github.com/datadog/dd-apm-test-agent#readme). + +### Forwarding CI Test Logs to Datadog + +Test output remains available in GitLab job artifacts. To also forward JUnit-captured output to Datadog, include the exact, case-sensitive `[ci: DEBUG_LOGS]` token in the commit message or set the GitLab CI variable `DD_CIVISIBILITY_LOGS_ENABLED=true`. + +The opt-in forwards all JUnit-captured output, not only DEBUG messages. diff --git a/docs/instrumentation_design_guidelines.md b/docs/instrumentation_design_guidelines.md index 305ff651439..6e4676e49d1 100644 --- a/docs/instrumentation_design_guidelines.md +++ b/docs/instrumentation_design_guidelines.md @@ -81,3 +81,19 @@ Context ctx = Context.current(); // GOOD - use the bytecode bridge, static-imported Context ctx = currentContext(); ``` + +### 4. Foreground/background thread cost contract + +**Why it matters:** + +- Advice bodies and span lifecycle methods run on the application (foreground) thread, where added cost is + customer-visible latency, as opposed to a background thread the tracer owns and paces itself +- Code meant to run only on a background thread must never become reachable from a foreground call site + +**What to do:** + +Mark code with `datadog.trace.api.function.ForegroundSafe` (cheap enough for either thread) or `.BackgroundOnly` +(must never be reached from the foreground) where the distinction matters, and see their Javadoc for the full +contract, including the inheritance-narrowing rule for overrides. This is a documentation-and-tooling convention +today (not yet compiler- or runtime-enforced); it is checked by hand and by the `dd-apm-sdk-review` skill's +performance lens. diff --git a/gradle.lockfile b/gradle.lockfile index b475d08a4d9..62fccbf9c11 100644 --- a/gradle.lockfile +++ b/gradle.lockfile @@ -2,8 +2,8 @@ # Manual edits 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.10.3=spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=spotbugs +com.github.spotbugs:spotbugs:4.10.4=spotbugs com.github.stephenc.jcip:jcip-annotations:1.0-1=spotbugs com.google.code.findbugs:jsr305:3.0.2=spotbugs com.google.code.gson:gson:2.14.0=spotbugs @@ -17,7 +17,6 @@ org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.dom4j:dom4j:2.2.0=spotbugs -org.junit:junit-bom:6.1.2=spotbugs org.ow2.asm:asm-analysis:9.10.1=spotbugs org.ow2.asm:asm-commons:9.10.1=spotbugs org.ow2.asm:asm-tree:9.10.1=spotbugs diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index e79e1561762..7ccee326de3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -7,7 +7,7 @@ forbiddenapis = "3.10" gradle-tooling-api = "8.14.5" jsr305 = "3.0.2" shadow = "9.4.2" -spotbugs_annotations = "4.10.3" +spotbugs_annotations = "4.10.4" # Source code formatters google-java-format = "1.36.1" diff --git a/internal-api/build.gradle.kts b/internal-api/build.gradle.kts index f36aa876e34..56684064eb4 100644 --- a/internal-api/build.gradle.kts +++ b/internal-api/build.gradle.kts @@ -87,8 +87,6 @@ extra["excludedClassesCoverage"] = listOf( // 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", @@ -107,7 +105,6 @@ extra["excludedClassesCoverage"] = listOf( "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", diff --git a/internal-api/gradle.lockfile b/internal-api/gradle.lockfile index a599f92a81e..b56eabefbd9 100644 --- a/internal-api/gradle.lockfile +++ b/internal-api/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=jmhRuntimeClasspath,runtimeClasspath,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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -34,6 +35,7 @@ org.apache.commons:commons-text:1.15.0=spotbugs org.apache.logging.log4j:log4j-api:2.26.1=spotbugs org.apache.logging.log4j:log4j-core:2.26.1=spotbugs org.apiguardian:apiguardian-api:1.1.2=testCompileClasspath +org.assertj:assertj-core:3.27.7=jmhRuntimeClasspath,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 @@ -61,7 +63,6 @@ org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileC org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.vintage:junit-vintage-engine:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/internal-api/internal-api-9/gradle.lockfile b/internal-api/internal-api-9/gradle.lockfile index 6d92ba336cb..29b5b2d4cd9 100644 --- a/internal-api/internal-api-9/gradle.lockfile +++ b/internal-api/internal-api-9/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,test com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -95,7 +95,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.openjdk.jmh:jmh-core:1.37=jmh,jmhCompileClasspath,jmhRuntimeClasspath 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 20d9d0509e5..dabb0e111ea 100644 --- a/internal-api/src/main/java/datadog/trace/api/Config.java +++ b/internal-api/src/main/java/datadog/trace/api/Config.java @@ -215,10 +215,12 @@ import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_ENDPOINT; import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_MAX_CONTENT_SIZE; import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_MAX_MESSAGES_LENGTH; +import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_REDACTION_ENABLED; import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_TIMEOUT; import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_ENABLED; import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_CONTENT_SIZE; import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH; +import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_REDACTION_ENABLED; import static datadog.trace.api.config.AIGuardConfig.DEFAULT_AI_GUARD_TIMEOUT; import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_BODY_ANALYSIS_SAMPLE_RATE; import static datadog.trace.api.config.AppSecConfig.API_SECURITY_DOWNSTREAM_REQUEST_ANALYSIS_SAMPLE_RATE; @@ -1469,6 +1471,7 @@ public static String getHostName() { private final int aiGuardTimeout; private final int aiGuardMaxMessagesLength; private final int aiGuardMaxContentSize; + private final boolean aiGuardRedactionEnabled; static { // Bind telemetry collector to config module before initializing ConfigProvider @@ -3463,6 +3466,8 @@ PROFILING_DATADOG_PROFILER_ENABLED, isDatadogProfilerSafeInCurrentEnvironment()) this.aiGuardMaxMessagesLength = configProvider.getInteger( AI_GUARD_MAX_MESSAGES_LENGTH, DEFAULT_AI_GUARD_MAX_MESSAGES_LENGTH); + this.aiGuardRedactionEnabled = + configProvider.getBoolean(AI_GUARD_REDACTION_ENABLED, DEFAULT_AI_GUARD_REDACTION_ENABLED); log.debug("New instance: {}", this); } @@ -6264,6 +6269,15 @@ public int getAiGuardTimeout() { return aiGuardTimeout; } + /** + * Global kill-switch for AI Guard sensitive data redaction. When {@code false}, the tracer never + * applies the redaction requested by the AI Guard service, even when the evaluation response asks + * for it. + */ + public boolean isAiGuardRedactionEnabled() { + return aiGuardRedactionEnabled; + } + private Set getSettingsSetFromEnvironment( String name, Function mapper, boolean splitOnWS) { final String value = configProvider.getString(name, ""); @@ -7030,6 +7044,8 @@ public String toString() { + aiGuardEnabled + ", aiGuardEndpoint=" + aiGuardEndpoint + + ", aiGuardRedactionEnabled=" + + aiGuardRedactionEnabled + ", logsOtelExporter=" + logsOtelExporter + ", logsOtelInterval=" diff --git a/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java b/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java index d1cd8024847..6a39b5bda96 100644 --- a/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java +++ b/internal-api/src/main/java/datadog/trace/api/cache/DDCache.java @@ -1,5 +1,6 @@ package datadog.trace.api.cache; +import datadog.trace.api.function.BackgroundOnly; import java.util.function.BiConsumer; import java.util.function.Function; @@ -16,6 +17,13 @@ public interface DDCache { /** Clear the cache. */ void clear(); - /** Visits elements currently in the cache; for debugging/triage purposes. */ + /** + * Visits elements currently in the cache; for debugging/triage purposes. + * + *

{@link BackgroundOnly}: every implementation invokes the caller-supplied {@code consumer} + * once per entry over a full scan, so the cost is unbounded regardless of the implementation's + * own scan shape. + */ + @BackgroundOnly void visit(BiConsumer consumer); } diff --git a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java index a8f5fc5f3fa..3baef9a2d13 100644 --- a/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java +++ b/internal-api/src/main/java/datadog/trace/api/cache/FixedSizeCache.java @@ -1,6 +1,8 @@ package datadog.trace.api.cache; import datadog.trace.api.Pair; +import datadog.trace.api.function.BackgroundOnly; +import datadog.trace.api.function.ForegroundSafe; import java.util.Arrays; import java.util.function.BiConsumer; import java.util.function.Function; @@ -16,6 +18,14 @@ * computeIfAbsent is idempotent, or otherwise you might not get back the value you expect * from a cache lookup. * + *

{@link ForegroundSafe} applies to {@code computeIfAbsent}'s probing -- at most 3 slot checks + * against a fixed-size array, no growth, no eviction sweep -- and to {@code clear()}, a plain array + * fill over the same fixed size. Neither covers the caller-supplied {@code producer} passed to + * {@code computeIfAbsent}, whose cost is the caller's responsibility exactly as with any + * higher-order method. {@code visit()} is {@link BackgroundOnly}: it invokes an arbitrary + * caller-supplied {@code consumer} once per entry, so its cost is unbounded regardless of the + * cache's own (bounded) scan. + * * @param key type * @param value type */ @@ -66,6 +76,7 @@ static int calculateSize(int capacity) { * @param producer how to create a cached value base on the key if the lookup fails * @return the cached or created and stored value */ + @ForegroundSafe @Override public final V computeIfAbsent(K key, Function producer) { if (key == null) { @@ -99,11 +110,13 @@ public final V computeIfAbsent(K key, Function producer) { return value; } + @ForegroundSafe @Override public void clear() { Arrays.fill(elements, null); } + @BackgroundOnly @Override public void visit(BiConsumer consumer) { for (Pair e : elements) { diff --git a/internal-api/src/main/java/datadog/trace/api/function/BackgroundOnly.java b/internal-api/src/main/java/datadog/trace/api/function/BackgroundOnly.java new file mode 100644 index 00000000000..495cceff866 --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/function/BackgroundOnly.java @@ -0,0 +1,88 @@ +package datadog.trace.api.function; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks code that must be confined to a background thread the tracer owns and paces itself -- e.g. + * serialization, stats aggregation, or eviction -- and must never be reached from an application + * thread (the foreground; see {@link ForegroundSafe}), where its cost would become customer-visible + * latency instead. + * + *

This is a documentation-and-tooling marker; it changes no behavior. It exists to telegraph the + * constraint to readers and to give a future checker (see {@code APMLP-1645}) something to verify + * -- that no {@code @BackgroundOnly} code is reachable from a foreground call site. The discipline + * it names is not yet enforced; hold to it by hand until the checker lands. + * + *

The two markers are not symmetric -- see {@link ForegroundSafe} for why it, not this + * one, is the strictly stronger guarantee. + * + *

Orthogonal to {@code @ThreadSafe} (JSR-305): that annotation says concurrent calls from + * multiple callers are safe; this one says which category of caller is valid at all -- background + * threads (there may be more than one), never the foreground/application thread. A class can, and + * often will, carry both. + * + *

On a type ({@link ElementType#TYPE}): every method of this type is background-only + * unless a method-level {@link ForegroundSafe} widens it. + * + *

On a method ({@link ElementType#METHOD}): this method specifically is background-only, + * regardless of what the enclosing type declares -- a method-level marker always wins over the + * type-level one. + * + *

Inheritance direction. An override may only narrow a supertype's declared + * cost, never widen it -- the same variance rule as a covariant return type, applied to a cost + * contract instead of a value type, and the same logic LSP applies to pre/postconditions: only a + * promise the supertype actually made can be broken by an override. A method overriding a + * {@code @BackgroundOnly} supertype/interface method may itself be marked {@link ForegroundSafe} if + * that override happens to be cheap: every caller holding a reference typed to the supertype + * already assumed the worse (background-only) case, so a cheaper override can't surprise them. The + * reverse can't be done safely when the supertype method is explicitly {@link ForegroundSafe}: + * overriding it and marking the override {@code @BackgroundOnly} breaks the promise for every + * existing caller holding a supertype-typed reference, without their code changing at all -- this + * is a violation at the declaration site itself, independent of whether any foreground call site + * currently exists in the diff. An unannotated supertype/interface method makes no cost + * promise at all, so marking an override {@code @BackgroundOnly} breaks nothing -- no caller + * holding the supertype-typed reference had assumed either case. + * + *

Checker contract. The rule below is written to be machine-checkable -- by a future + * static checker, or in the meantime by an AI reviewer (see the {@code dd-apm-sdk-review} skill's + * performance override, addendum J16) -- without needing to read this class's prose above. + * + *

    + *
  • Trigger: a call site in code that is unannotated or {@link ForegroundSafe} and is + * reachable from an application/foreground call site (a span lifecycle method, an + * instrumentation advice body, anything on the app thread), into a symbol (type or method) + * annotated {@code @BackgroundOnly}. + *
  • Not a trigger: a call from code that is itself {@code @BackgroundOnly} -- calls + * between background-only code are fine, only the foreground-to-background crossing is the + * violation. Also not a trigger: a call into a symbol that carries neither marker -- the + * absence of an annotation is not itself a finding, only a call that provably crosses a + * declared {@code @BackgroundOnly} boundary counts. + *
  • Violation example: a span-lifecycle method or advice body calling {@code + * sharedUtf8Cache.getUtf8(value)} where {@code sharedUtf8Cache}'s declared type is annotated + * {@code @BackgroundOnly}. + *
  • Compliant example: the same call made only from the background serializer thread + * that owns the cache, or from a method itself marked {@code @BackgroundOnly}. + *
  • Also a trigger, at the declaration site: a method overriding an explicitly {@link + * ForegroundSafe} supertype/interface method that marks the override {@code @BackgroundOnly} + * -- see "Inheritance direction" above. Flag this the moment it appears; it does not require + * a foreground call site to exist yet. Overriding an unannotated supertype/interface + * method with {@code @BackgroundOnly} is not a trigger -- the supertype made no promise to + * break. + *
  • Out of scope (v1): resolution is grep-only today (there is no APT-generated manifest + * yet -- {@code APMLP-1645}), so a callee outside the diff costs a grep per unfamiliar symbol + * rather than a lookup; reflection and dynamic-proxy call sites are not resolved at all. + *
  • Propagation across an interface boundary (concrete implementation to the interface + * method it implements, and one hop further into a default method that calls it) is a bounded + * extension of the direct-call trigger above, not a separate rule -- see the {@code + * dd-apm-sdk-review} skill's performance override, addendum {@code background-only-contract}, + * for its exact two-hop scope. + *
+ */ +@Documented +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE, ElementType.METHOD}) +public @interface BackgroundOnly {} diff --git a/internal-api/src/main/java/datadog/trace/api/function/ForegroundSafe.java b/internal-api/src/main/java/datadog/trace/api/function/ForegroundSafe.java new file mode 100644 index 00000000000..1bb1ce5d2df --- /dev/null +++ b/internal-api/src/main/java/datadog/trace/api/function/ForegroundSafe.java @@ -0,0 +1,49 @@ +package datadog.trace.api.function; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Marks code cheap enough to call from an application thread (the foreground) -- the request or + * transaction thread the instrumented application itself is running, where any added cost is + * customer-visible latency, as opposed to a background thread the tracer owns and paces itself (see + * {@link BackgroundOnly}). + * + *

This is a documentation-and-tooling marker; it changes no behavior. It exists to telegraph the + * guarantee to readers and to give a future checker (see {@code APMLP-1645}) something to verify -- + * that no {@link BackgroundOnly} code is reachable from a foreground call site. The discipline it + * names is not yet enforced; hold to it by hand until the checker lands. + * + *

The two markers are not symmetric. {@code @ForegroundSafe} is the strictly stronger + * guarantee: code cheap enough for the foreground is automatically fine to call from a background + * thread too, so a {@code @ForegroundSafe} type or method may be called from either. {@link + * BackgroundOnly} code carries no such guarantee and must never be reached from a foreground call + * site. + * + *

On a type ({@link ElementType#TYPE}): every method of this type is foreground-safe + * unless a method-level {@link BackgroundOnly} narrows it. + * + *

On a method ({@link ElementType#METHOD}): this method specifically is foreground-safe, + * regardless of what the enclosing type declares -- a method-level marker always wins over the + * type-level one. + * + *

Inheritance direction: like a behavioral-subtyping (LSP) contract, only an actual + * promise from the supertype can be broken -- an override may narrow a {@link BackgroundOnly} + * supertype/interface method to {@code @ForegroundSafe} (a cheaper override can't surprise a caller + * who already assumed the worse case) but may never widen an explicitly {@code @ForegroundSafe} + * supertype method to {@link BackgroundOnly}. An unannotated supertype method makes no + * promise either way, so marking an override {@link BackgroundOnly} is not a violation -- see + * {@link BackgroundOnly}'s "Inheritance direction" for the full rule. + * + *

Checker contract. This annotation is not itself a trigger -- it is what makes a call + * site not suspect. See {@link BackgroundOnly}'s checker contract for the actual rule: + * code marked {@code @ForegroundSafe} (or carrying no marker) is exactly the caller side of the + * violation that contract flags when it reaches a {@code @BackgroundOnly} symbol. + */ +@Documented +@Retention(RetentionPolicy.CLASS) +@Target({ElementType.TYPE, ElementType.METHOD}) +public @interface ForegroundSafe {} diff --git a/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java b/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java index ce89ab920e7..a9c11618e11 100644 --- a/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java +++ b/internal-api/src/main/java/datadog/trace/api/gateway/BlockResponseFunction.java @@ -1,6 +1,7 @@ package datadog.trace.api.gateway; import datadog.appsec.api.blocking.BlockingContentType; +import datadog.trace.api.appsec.AppSecContext; import datadog.trace.api.internal.TraceSegment; import java.util.Map; @@ -44,4 +45,28 @@ default boolean tryCommitBlockingResponse( action.getExtraHeaders(), action.getSecurityResponseId()); } + + /** + * Commits blocking response using a RequestBlockingAction, reporting to {@link + * AppSecContext#reportBlockFailure()} if the commit fails. + * + *

It's responsible for calling {@link TraceSegment#effectivelyBlocked()} before the span is + * finished. + * + * @param ctx the request context + * @param action the blocking action containing status code, content type, headers, and security + * response ID + * @return true unless blocking could not be attempted + */ + default boolean tryCommitBlockingResponse( + RequestContext ctx, Flow.Action.RequestBlockingAction action) { + boolean committed = tryCommitBlockingResponse(ctx.getTraceSegment(), action); + if (!committed) { + Object rawAppSecCtx = ctx.getData(RequestContextSlot.APPSEC); + if (rawAppSecCtx instanceof AppSecContext) { + ((AppSecContext) rawAppSecCtx).reportBlockFailure(); + } + } + return committed; + } } 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 5d510f23a1a..98797a1979a 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 @@ -3,6 +3,7 @@ import datadog.trace.api.aiguard.AIGuard; import datadog.trace.util.TagsHelper; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; +import java.util.Arrays; import java.util.Collection; import java.util.Collections; import java.util.HashMap; @@ -34,6 +35,19 @@ private WafMetricCollector() { private static final String NAMESPACE = "appsec"; + /** + * AI Guard metrics live in their own telemetry namespace. The namespace and the metric name are + * reported as separate fields and joined downstream, so {@code ai_guard} + {@code requests} is + * what surfaces the {@code ai_guard.requests} metric the AI Guard RFC specifies. + */ + private static final String AI_GUARD_NAMESPACE = "ai_guard"; + + /** Hoisted because {@link Enum#values()} clones its backing array on every call. */ + private static final AIGuardRedaction[] REDACTION_VALUES = AIGuardRedaction.values(); + + /** Hoisted because {@link Enum#values()} clones its backing array on every call. */ + private static final AIGuardError[] AI_GUARD_ERROR_VALUES = AIGuardError.values(); + private static final BlockingQueue rawMetricsQueue = new ArrayBlockingQueue<>(RAW_QUEUE_SIZE); @@ -64,8 +78,13 @@ private WafMetricCollector() { private static final AtomicInteger wafConfigErrorCounter = new AtomicInteger(); private static final AtomicInteger contextClosedRaceCounter = new AtomicInteger(); private static final AtomicLongArray aiGuardRequests = - new AtomicLongArray(AIGuard.Action.values().length * 2); // 3 actions * block + new AtomicLongArray( + AIGuard.Action.values().length + * 2 + * REDACTION_VALUES.length); // actions * block * redaction state private static final AtomicInteger aiGuardErrors = new AtomicInteger(); + private static final AtomicLongArray aiGuardErrorTypes = + new AtomicLongArray(AI_GUARD_ERROR_VALUES.length); private static final AtomicLongArray aiGuardTruncated = new AtomicLongArray(AIGuardTruncationType.values().length); @@ -246,12 +265,33 @@ public void appSecSdkEvent(final LoginEvent event, final LoginVersion version) { appSecSdkEventQueue.incrementAndGet(index); } - public void aiGuardRequest(final AIGuard.Action action, final boolean block) { - aiGuardRequests.incrementAndGet(action.ordinal() * 2 + (block ? 1 : 0)); + public void aiGuardRequest( + final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) { + aiGuardRequests.incrementAndGet(aiGuardRequestIndex(action, block, redaction)); + } + + private static int aiGuardRequestIndex( + final AIGuard.Action action, final boolean block, final AIGuardRedaction redaction) { + return (action.ordinal() * 2 + (block ? 1 : 0)) * REDACTION_VALUES.length + redaction.ordinal(); } - public void aiGuardError() { + /** + * Reports an evaluation that failed. The failure is counted twice on purpose, mirroring every + * other tracer: as {@code error:true} on {@code ai_guard.requests}, which keeps the request count + * complete, and under {@code ai_guard.error} with the {@code type} that classifies it. + */ + public void aiGuardError(final AIGuardError type) { aiGuardErrors.incrementAndGet(); + aiGuardErrorTypes.incrementAndGet(type.ordinal()); + } + + /** + * Reports {@code count} replacements that redaction could not apply. Unlike {@link + * #aiGuardError(AIGuardError)} this does not count a failed request: redaction is best effort and + * never fails the evaluation it rode in on. + */ + public void aiGuardRedactionErrors(final long count) { + aiGuardErrorTypes.addAndGet(AIGuardError.REDACTION_ERROR.ordinal(), count); } public void aiGuardTruncated(final AIGuardTruncationType type) { @@ -521,17 +561,18 @@ public void prepareMetrics() { } // AI Guard successful requests + aiGuardSuccesses: for (final AIGuard.Action action : AIGuard.Action.values()) { - final long blocked = aiGuardRequests.getAndSet(action.ordinal() * 2 + 1, 0); - if (blocked > 0) { - if (!rawMetricsQueue.offer(AIGuardRequests.success(blocked, action, true))) { - break; - } - } - final long nonBlocked = aiGuardRequests.getAndSet(action.ordinal() * 2, 0); - if (nonBlocked > 0) { - if (!rawMetricsQueue.offer(AIGuardRequests.success(nonBlocked, action, false))) { - break; + for (int blockFlag = 1; blockFlag >= 0; blockFlag--) { + final boolean block = blockFlag == 1; + for (final AIGuardRedaction redaction : REDACTION_VALUES) { + final long count = + aiGuardRequests.getAndSet(aiGuardRequestIndex(action, block, redaction), 0); + if (count > 0) { + if (!rawMetricsQueue.offer(AIGuardRequests.success(count, action, block, redaction))) { + break aiGuardSuccesses; + } + } } } } @@ -544,6 +585,16 @@ public void prepareMetrics() { } } + // AI Guard errors, per type + for (final AIGuardError type : AI_GUARD_ERROR_VALUES) { + final long count = aiGuardErrorTypes.getAndSet(type.ordinal(), 0); + if (count > 0) { + if (!rawMetricsQueue.offer(new AIGuardErrors(count, type))) { + return; + } + } + } + // AI Guard truncated messages for (final AIGuardTruncationType type : AIGuardTruncationType.values()) { final long count = aiGuardTruncated.getAndSet(type.ordinal(), 0); @@ -589,7 +640,11 @@ public void prepareMetrics() { public abstract static class WafMetric extends MetricCollector.Metric { public WafMetric(String metricName, long counter, String... tags) { - super(NAMESPACE, true, metricName, "count", counter, tags); + this(NAMESPACE, metricName, counter, tags); + } + + protected WafMetric(String namespace, String metricName, long counter, String... tags) { + super(namespace, true, metricName, "count", counter, tags); } } @@ -823,14 +878,48 @@ public WafInputTruncated(final long counter, final int bitfield) { } } - public static class AIGuardRequests extends WafMetric { + /** Base class for the metrics reported under the {@code ai_guard} namespace. */ + public abstract static class AIGuardMetric extends WafMetric { + + /** + * Call-path tags the AI Guard specification requires on every metric in this namespace. Both + * are constant here: the JVM tracer only reaches an evaluation through a direct SDK call, so + * there is no auto-instrumented integration to name. They become dimensional once AI Guard + * auto-instrumentation lands. + */ + private static final String[] CALL_PATH_TAGS = {"source:sdk", "integration:none"}; + + protected AIGuardMetric(final String metricName, final long counter, final String... tags) { + super(AI_GUARD_NAMESPACE, metricName, counter, withCallPath(tags)); + } + + private static String[] withCallPath(final String[] tags) { + final String[] result = Arrays.copyOf(tags, tags.length + CALL_PATH_TAGS.length); + System.arraycopy(CALL_PATH_TAGS, 0, result, tags.length, CALL_PATH_TAGS.length); + return result; + } + } + + public static class AIGuardRequests extends AIGuardMetric { private AIGuardRequests(final long count, final String... tags) { - super("ai_guard.requests", count, tags); + super("requests", count, tags); } public static AIGuardRequests success( - final long count, final AIGuard.Action action, final boolean block) { - return new AIGuardRequests(count, "action:" + action, "block:" + block, "error:false"); + final long count, + final AIGuard.Action action, + final boolean block, + final AIGuardRedaction redaction) { + if (redaction == AIGuardRedaction.DISABLED) { + // No redacted tag at all, so its absence stays distinguishable from a false value. + return new AIGuardRequests(count, "action:" + action, "block:" + block, "error:false"); + } + return new AIGuardRequests( + count, + "action:" + action, + "block:" + block, + "error:false", + "redacted:" + (redaction == AIGuardRedaction.APPLIED)); } public static AIGuardRequests error(final long count) { @@ -838,9 +927,20 @@ public static AIGuardRequests error(final long count) { } } - public static class AIGuardTruncated extends WafMetric { + /** + * Failures reported under {@code ai_guard.error}, classified by {@link AIGuardError}. An + * evaluation failure is reported here and as {@code error:true} on {@code + * ai_guard.requests}; a redaction error is reported only here. + */ + public static class AIGuardErrors extends AIGuardMetric { + public AIGuardErrors(final long count, final AIGuardError type) { + super("error", count, "type:" + type.tagValue); + } + } + + public static class AIGuardTruncated extends AIGuardMetric { public AIGuardTruncated(final long count, final AIGuardTruncationType type) { - super("ai_guard.truncated", count, "type:" + type.tagValue); + super("truncated", count, "type:" + type.tagValue); } } @@ -862,6 +962,40 @@ public ApiSecurityRequestNoSchema(final long counter, final String framework) { } } + /** + * Whether an evaluation redacted anything, as reported by the {@code redacted} tag on {@code + * ai_guard.requests}. {@link #DISABLED} reports no tag at all, so an absent tag means "redaction + * is off" and stays distinguishable from {@code redacted:false}. + */ + public enum AIGuardRedaction { + /** Redaction is disabled locally, so nothing was even attempted. */ + DISABLED, + /** Redaction is enabled and at least one replacement was applied. */ + APPLIED, + /** Redaction is enabled but nothing was redacted. */ + NOT_APPLIED + } + + /** + * Classification of the failures reported under {@code ai_guard.error}, as the {@code type} tag. + */ + public enum AIGuardError { + /** A transport failure, or any error the tracer could not attribute to the response. */ + CLIENT_ERROR("client_error"), + /** The service answered with a status code that explains the failure on its own. */ + BAD_STATUS("bad_status"), + /** The service answered successfully, with a body the tracer cannot use. */ + BAD_RESPONSE("bad_response"), + /** A redaction replacement the tracer could not apply. Never fails the evaluation. */ + REDACTION_ERROR("redaction_error"); + + public final String tagValue; + + AIGuardError(final String tagValue) { + this.tagValue = tagValue; + } + } + public enum AIGuardTruncationType { MESSAGES("messages"), CONTENT("content"); 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 deleted file mode 100644 index 39741a55c3e..00000000000 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentScope.java +++ /dev/null @@ -1,18 +0,0 @@ -package datadog.trace.bootstrap.instrumentation.api; - -import datadog.context.Context; -import datadog.context.ContextScope; -import datadog.trace.context.TraceScope; -import java.io.Closeable; - -public interface AgentScope extends ContextScope, TraceScope, Closeable { - AgentSpan span(); - - @Override - default Context context() { - return span(); - } - - @Override - void close(); -} 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 dd17b8ccc7c..94c0f80572a 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 @@ -45,6 +45,16 @@ static AgentSpan fromContext(Context context) { return context == null ? null : context.get(SPAN_KEY); } + /** + * Extracts the span from the given {@link ContextScope}. + * + * @param scope the context scope to extract the span from. + * @return the span if existing, {@code null} otherwise. + */ + static AgentSpan fromScope(ContextScope scope) { + return scope == null ? null : scope.context().get(SPAN_KEY); + } + /** * Creates a span wrapper from a span context. * diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java index a40bf5e7603..71767ea7fae 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/AgentTracer.java @@ -77,7 +77,7 @@ public static AgentSpan startSpan( return get().startSpan(prototype, operationName); } - public static AgentScope activateSpan(final AgentSpan span) { + public static ContextScope activateSpan(final AgentSpan span) { return get().activateSpan(span); } @@ -139,7 +139,7 @@ public static void closePrevious(final boolean finishSpan) { * * @see datadog.trace.api.config.TracerConfig#SCOPE_ITERATION_KEEP_ALIVE */ - public static AgentScope activateNext(final AgentSpan span) { + public static ContextScope activateNext(final AgentSpan span) { return get().activateNext(span); } @@ -288,10 +288,10 @@ AgentSpan startSpan( long startTimeMicros); /** Activate a span from inside auto-instrumentation. */ - AgentScope activateSpan(AgentSpan span); + ContextScope activateSpan(AgentSpan span); /** Activate a span from outside auto-instrumentation, i.e. a manual or custom span. */ - AgentScope activateManualSpan(AgentSpan span); + ContextScope activateManualSpan(AgentSpan span); /** Activate a span which will be closed by {@link #closeActive()} instead of a scope. */ void activateSpanWithoutScope(AgentSpan span); @@ -314,7 +314,7 @@ default TraceScope.Continuation captureActiveSpan() { void closePrevious(boolean finishSpan); - AgentScope activateNext(AgentSpan span); + ContextScope activateNext(AgentSpan span); AgentSpan activeSpan(); @@ -488,12 +488,12 @@ public AgentSpan startSpan( } @Override - public AgentScope activateSpan(final AgentSpan span) { + public ContextScope activateSpan(final AgentSpan span) { return NoopScope.INSTANCE; } @Override - public AgentScope activateManualSpan(final AgentSpan span) { + public ContextScope activateManualSpan(final AgentSpan span) { return NoopScope.INSTANCE; } @@ -521,7 +521,7 @@ public void closeActive() {} public void closePrevious(final boolean finishSpan) {} @Override - public AgentScope activateNext(final AgentSpan span) { + public ContextScope activateNext(final AgentSpan span) { return NoopScope.INSTANCE; } @@ -608,7 +608,7 @@ public boolean addTraceInterceptor(final TraceInterceptor traceInterceptor) { @Override public TraceScope muteTracing() { - return NoopScope.INSTANCE; + return NoopTraceScope.INSTANCE; } @Override diff --git a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java index f77750a4710..5347b5de1c7 100644 --- a/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java +++ b/internal-api/src/main/java/datadog/trace/bootstrap/instrumentation/api/NoopScope.java @@ -1,12 +1,15 @@ package datadog.trace.bootstrap.instrumentation.api; -public final class NoopScope implements AgentScope { +import datadog.context.Context; +import datadog.context.ContextScope; + +public final class NoopScope implements ContextScope { public static final NoopScope INSTANCE = new NoopScope(); private NoopScope() {} @Override - public AgentSpan span() { + public Context context() { return NoopSpan.INSTANCE; } 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 d35a4d6816d..0ba499087db 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 @@ -1,6 +1,13 @@ package datadog.trace.api.telemetry import static datadog.trace.api.aiguard.AIGuard.Action.ABORT +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardError.BAD_RESPONSE +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardError.BAD_STATUS +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardError.CLIENT_ERROR +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardError.REDACTION_ERROR +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardRedaction.APPLIED +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardRedaction.DISABLED +import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardRedaction.NOT_APPLIED import static datadog.trace.api.aiguard.AIGuard.Action.ALLOW import static datadog.trace.api.aiguard.AIGuard.Action.DENY import static datadog.trace.api.telemetry.WafMetricCollector.AIGuardTruncationType.CONTENT @@ -19,6 +26,12 @@ import static datadog.trace.api.telemetry.LoginVersion.V2 class WafMetricCollectorTest extends DDSpecification { + /** + * Call-path tags every ai_guard metric carries. Both are constant while a direct SDK call is the + * only way to reach an evaluation in this tracer. + */ + private static final List CALL_PATH = ['source:sdk', 'integration:none'] + public static final int DD_WAF_RUN_INTERNAL_ERROR = WafMetricCollector.WafErrorCode.INTERNAL_ERROR.getCode() public static final int DD_WAF_RUN_INVALID_OBJECT_ERROR = WafMetricCollector.WafErrorCode.INVALID_OBJECT.getCode() @@ -533,19 +546,19 @@ class WafMetricCollectorTest extends DDSpecification { final collector = WafMetricCollector.get() when: - collector.aiGuardRequest(action, block) + collector.aiGuardRequest(action, block, NOT_APPLIED) then: collector.prepareMetrics() final metrics = collector.drain() - final configErrorMetrics = metrics.findAll { it.metricName == 'ai_guard.requests' } + final configErrorMetrics = metrics.findAll { it.metricName == 'requests' } final metric = configErrorMetrics[0] metric.type == 'count' - metric.metricName == 'ai_guard.requests' - metric.namespace == 'appsec' + metric.metricName == 'requests' + metric.namespace == 'ai_guard' metric.value == 1 - metric.tags.toSet() == ["action:${action.name()}", "block:${block}", 'error:false'].toSet() + metric.tags.toSet() == (["action:${action.name()}", "block:${block}", 'error:false', 'redacted:false'] + CALL_PATH).toSet() where: action | block @@ -557,24 +570,73 @@ class WafMetricCollectorTest extends DDSpecification { ABORT | false } + void 'test ai guard redaction telemetry tag'() { + given: + final collector = WafMetricCollector.get() + + when: + collector.aiGuardRequest(ALLOW, false, redaction) + + then: + collector.prepareMetrics() + final metric = collector.drain().find { it.metricName == 'requests' } + metric.tags.toSet() == (expectedTags + CALL_PATH).toSet() + + where: + redaction | expectedTags + APPLIED | ['action:ALLOW', 'block:false', 'error:false', 'redacted:true'] + NOT_APPLIED | ['action:ALLOW', 'block:false', 'error:false', 'redacted:false'] + // the kill switch reports no redacted tag at all + DISABLED | ['action:ALLOW', 'block:false', 'error:false'] + } + void 'test ai guard error'() { given: final collector = WafMetricCollector.get() when: - collector.aiGuardError() + collector.aiGuardError(type) then: collector.prepareMetrics() final metrics = collector.drain() - final configErrorMetrics = metrics.findAll { it.metricName == 'ai_guard.requests' } - final metric = configErrorMetrics[0] - metric.type == 'count' - metric.metricName == 'ai_guard.requests' - metric.namespace == 'appsec' - metric.value == 1 - metric.tags.toSet() == ['error:true'].toSet() + // a failed evaluation keeps the request count complete... + final request = metrics.find { it.metricName == 'requests' } + request.namespace == 'ai_guard' + request.value == 1 + request.tags.toSet() == (['error:true'] + CALL_PATH).toSet() + + // ...and is classified under its own metric + final error = metrics.find { it.metricName == 'error' } + error.type == 'count' + error.namespace == 'ai_guard' + error.value == 1 + error.tags.toSet() == (["type:${type.tagValue}"] + CALL_PATH).toSet() + + where: + type << [CLIENT_ERROR, BAD_STATUS, BAD_RESPONSE, REDACTION_ERROR] + } + + void 'test ai guard redaction errors'() { + given: + final collector = WafMetricCollector.get() + + when: + collector.aiGuardRedactionErrors(3) + + then: + collector.prepareMetrics() + final metrics = collector.drain() + + final error = metrics.find { it.metricName == 'error' } + error.namespace == 'ai_guard' + // one count per replacement that could not be applied + error.value == 3 + error.tags.toSet() == (['type:redaction_error'] + CALL_PATH).toSet() + + // redaction never fails the evaluation it rode in on, so no request is counted as failed + metrics.every { it.metricName != 'requests' } } void 'test ai guard truncated'() { @@ -587,14 +649,14 @@ class WafMetricCollectorTest extends DDSpecification { then: collector.prepareMetrics() final metrics = collector.drain() - final configErrorMetrics = metrics.findAll { it.metricName == 'ai_guard.truncated' } + final configErrorMetrics = metrics.findAll { it.metricName == 'truncated' } final metric = configErrorMetrics[0] metric.type == 'count' - metric.metricName == 'ai_guard.truncated' - metric.namespace == 'appsec' + metric.metricName == 'truncated' + metric.namespace == 'ai_guard' metric.value == 1 - metric.tags.toSet() == ["type:${type.tagValue}"].toSet() + metric.tags.toSet() == (["type:${type.tagValue}"] + CALL_PATH).toSet() where: type << [MESSAGES, CONTENT] diff --git a/internal-api/src/test/groovy/datadog/trace/util/ProcessSupervisorTest.groovy b/internal-api/src/test/groovy/datadog/trace/util/ProcessSupervisorTest.groovy index eb8af334502..dce93754c55 100644 --- a/internal-api/src/test/groovy/datadog/trace/util/ProcessSupervisorTest.groovy +++ b/internal-api/src/test/groovy/datadog/trace/util/ProcessSupervisorTest.groovy @@ -1,14 +1,15 @@ package datadog.trace.util import datadog.trace.test.util.DDSpecification +import datadog.trace.test.util.PortableCommand import spock.util.concurrent.PollingConditions // This test looks at the private "currentProcess" variable because the alternative // would be calling "ps -e" repeatedly class ProcessSupervisorTest extends DDSpecification { ProcessBuilder createProcessBuilder() { - // Creates a process that never returns - return new ProcessBuilder("tail", "-f", "/dev/null") + // Creates a process that never returns on its own + return new ProcessBuilder(PortableCommand.runForever()) } def "Process killed when supervisor closed"() { diff --git a/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java b/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java new file mode 100644 index 00000000000..338b2e30145 --- /dev/null +++ b/internal-api/src/test/java/datadog/trace/api/ConfigAIGuardRedactionTest.java @@ -0,0 +1,56 @@ +package datadog.trace.api; + +import static datadog.trace.api.config.AIGuardConfig.AI_GUARD_REDACTION_ENABLED; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.trace.test.junit.utils.config.WithConfigExtension; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; + +@ExtendWith(WithConfigExtension.class) +class ConfigAIGuardRedactionTest { + + @Test + void redactionIsEnabledByDefault() { + assertTrue(Config.get().isAiGuardRedactionEnabled()); + } + + @Test + void killSwitchDisablesRedactionViaSystemProperty() { + WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "false"); + + assertFalse(Config.get().isAiGuardRedactionEnabled()); + } + + @Test + void killSwitchDisablesRedactionViaEnvironmentVariable() { + WithConfigExtension.injectEnvConfig("DD_AI_GUARD_REDACTION_ENABLED", "false", false); + + assertFalse(Config.get().isAiGuardRedactionEnabled()); + } + + @Test + void killSwitchAcceptsNumericAndMixedCaseValues() { + WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "0"); + assertFalse(Config.get().isAiGuardRedactionEnabled()); + + WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "FALSE"); + assertFalse(Config.get().isAiGuardRedactionEnabled()); + + WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "True"); + assertTrue(Config.get().isAiGuardRedactionEnabled()); + } + + /** + * Invalid boolean values resolve to {@code false} rather than to the configured default: see the + * backward-compatibility branch in {@code ConfigProvider#get}. A typo therefore turns redaction + * off, even though it defaults to on. + */ + @Test + void unparseableValueDisablesRedaction() { + WithConfigExtension.injectSysConfig(AI_GUARD_REDACTION_ENABLED, "not-a-boolean"); + + assertFalse(Config.get().isAiGuardRedactionEnabled()); + } +} diff --git a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/NettyMultipartHelperBlockFailureTest.java b/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java similarity index 52% rename from dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/NettyMultipartHelperBlockFailureTest.java rename to internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java index c0c9dbae5f2..e07f49ceb12 100644 --- a/dd-java-agent/instrumentation/netty/netty-4.1/src/test/java/datadog/trace/instrumentation/netty41/NettyMultipartHelperBlockFailureTest.java +++ b/internal-api/src/test/java/datadog/trace/api/gateway/BlockResponseFunctionTest.java @@ -1,16 +1,12 @@ -package datadog.trace.instrumentation.netty41; +package datadog.trace.api.gateway; import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; import datadog.appsec.api.blocking.BlockingContentType; -import datadog.appsec.api.blocking.BlockingException; import datadog.trace.api.appsec.AppSecContext; -import datadog.trace.api.gateway.BlockResponseFunction; -import datadog.trace.api.gateway.Flow; -import datadog.trace.api.gateway.RequestContext; -import datadog.trace.api.gateway.RequestContextSlot; import datadog.trace.api.internal.TraceSegment; import datadog.trace.bootstrap.instrumentation.api.ClientIpAddressData; import java.util.Map; @@ -18,65 +14,47 @@ import org.junit.jupiter.api.Test; /** - * Covers the {@code tryBlock() -> AppSecContext.reportBlockFailure()} path. Hand-written test - * doubles are used because Mockito is only on this module's test runtime classpath, not its test - * compile classpath. + * Covers the {@code tryCommitBlockingResponse(RequestContext, RequestBlockingAction)} default + * method, which reports a block failure to {@link AppSecContext#reportBlockFailure()} when the + * blocking response cannot be committed. */ -class NettyMultipartHelperBlockFailureTest { +class BlockResponseFunctionTest { private static final Flow.Action.RequestBlockingAction RBA = new Flow.Action.RequestBlockingAction(403, BlockingContentType.AUTO); @Test - void reportsBlockFailureWhenBlockingResponseCannotBeCommitted() { + void doesNotReportBlockFailureWhenCommitSucceeds() { CountingAppSecContext appSecCtx = new CountingAppSecContext(); - TestRequestContext ctx = - new TestRequestContext(new TestBlockResponseFunction(false), appSecCtx); + TestRequestContext ctx = new TestRequestContext(appSecCtx); + TestBlockResponseFunction brf = new TestBlockResponseFunction(true); - BlockingException exception = NettyMultipartHelper.tryBlock(ctx, blockingFlow(), "blocked!"); + assertTrue(brf.tryCommitBlockingResponse(ctx, RBA)); - assertNotNull(exception); - assertEquals("blocked!", exception.getMessage()); - assertEquals(1, appSecCtx.blockFailures); - assertSame(RBA, ctx.brf.lastAction); - assertSame(ctx.traceSegment, ctx.brf.lastSegment); + assertSame(ctx.traceSegment, brf.lastSegment); + assertEquals(403, brf.lastStatusCode); + assertEquals(BlockingContentType.AUTO, brf.lastTemplateType); + assertEquals(0, appSecCtx.blockFailures); } @Test - void doesNotReportBlockFailureWhenBlockingResponseIsCommitted() { + void reportsBlockFailureWhenCommitFails() { CountingAppSecContext appSecCtx = new CountingAppSecContext(); - TestRequestContext ctx = new TestRequestContext(new TestBlockResponseFunction(true), appSecCtx); + TestRequestContext ctx = new TestRequestContext(appSecCtx); + TestBlockResponseFunction brf = new TestBlockResponseFunction(false); - BlockingException exception = NettyMultipartHelper.tryBlock(ctx, blockingFlow(), "blocked!"); + assertFalse(brf.tryCommitBlockingResponse(ctx, RBA)); - assertNotNull(exception); - assertEquals("blocked!", exception.getMessage()); - assertEquals(0, appSecCtx.blockFailures); + assertSame(ctx.traceSegment, brf.lastSegment); + assertEquals(1, appSecCtx.blockFailures); } @Test void doesNotThrowWhenAppSecSlotDoesNotHoldAnAppSecContext() { - TestRequestContext nullSlot = - new TestRequestContext(new TestBlockResponseFunction(false), null); - assertNotNull(NettyMultipartHelper.tryBlock(nullSlot, blockingFlow(), "blocked!")); - - TestRequestContext foreignSlot = - new TestRequestContext(new TestBlockResponseFunction(false), "not an AppSecContext"); - assertNotNull(NettyMultipartHelper.tryBlock(foreignSlot, blockingFlow(), "blocked!")); - } + TestBlockResponseFunction brf = new TestBlockResponseFunction(false); - private static Flow blockingFlow() { - return new Flow() { - @Override - public Action getAction() { - return RBA; - } - - @Override - public Void getResult() { - return null; - } - }; + assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext(null), RBA)); + assertFalse(brf.tryCommitBlockingResponse(new TestRequestContext("not an AppSecContext"), RBA)); } private static final class CountingAppSecContext implements AppSecContext { @@ -96,19 +74,13 @@ public void reportBlockFailure() { private static final class TestBlockResponseFunction implements BlockResponseFunction { private final boolean committed; private TraceSegment lastSegment; - private Flow.Action.RequestBlockingAction lastAction; + private int lastStatusCode; + private BlockingContentType lastTemplateType; private TestBlockResponseFunction(boolean committed) { this.committed = committed; } - @Override - public boolean tryCommitBlockingResponse( - TraceSegment segment, Flow.Action.RequestBlockingAction rba) { - this.lastAction = rba; - return BlockResponseFunction.super.tryCommitBlockingResponse(segment, rba); - } - @Override public boolean tryCommitBlockingResponse( TraceSegment segment, @@ -117,17 +89,17 @@ public boolean tryCommitBlockingResponse( Map extraHeaders, String securityResponseId) { this.lastSegment = segment; + this.lastStatusCode = statusCode; + this.lastTemplateType = templateType; return committed; } } private static final class TestRequestContext implements RequestContext { - private final TestBlockResponseFunction brf; private final Object appSecData; private final TraceSegment traceSegment = TraceSegment.NoOp.INSTANCE; - private TestRequestContext(TestBlockResponseFunction brf, Object appSecData) { - this.brf = brf; + private TestRequestContext(Object appSecData) { this.appSecData = appSecData; } @@ -147,7 +119,7 @@ public void setBlockResponseFunction(BlockResponseFunction blockResponseFunction @Override public BlockResponseFunction getBlockResponseFunction() { - return brf; + return null; } @Override diff --git a/metadata/supported-configurations.json b/metadata/supported-configurations.json index b443c1fbd66..eff89984445 100644 --- a/metadata/supported-configurations.json +++ b/metadata/supported-configurations.json @@ -97,6 +97,14 @@ "aliases": [] } ], + "DD_AI_GUARD_REDACTION_ENABLED": [ + { + "version": "A", + "type": "boolean", + "default": "true", + "aliases": [] + } + ], "DD_AI_GUARD_TIMEOUT": [ { "version": "A", @@ -6366,9 +6374,9 @@ ], "DD_TRACE_GUIDEWIRE_ENABLED": [ { - "version": "A", + "version": "B", "type": "boolean", - "default": "false", + "default": "true", "aliases": ["DD_TRACE_INTEGRATION_GUIDEWIRE_ENABLED", "DD_INTEGRATION_GUIDEWIRE_ENABLED"] } ], diff --git a/products/feature-flagging/feature-flagging-agent/gradle.lockfile b/products/feature-flagging/feature-flagging-agent/gradle.lockfile index 35dfd521557..b6e8b8ba828 100644 --- a/products/feature-flagging/feature-flagging-agent/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-agent/gradle.lockfile @@ -8,6 +8,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.datadoghq.okio:okio:1.17.6=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=runtimeClasspath,testRuntimeClasspath @@ -20,8 +21,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -74,7 +75,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/products/feature-flagging/feature-flagging-api/gradle.lockfile b/products/feature-flagging/feature-flagging-api/gradle.lockfile index f514033bf1c..6eb7de88b1c 100644 --- a/products/feature-flagging/feature-flagging-api/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-api/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -59,7 +59,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile index 992df11c2e8..c9ffa5ecd94 100644 --- a/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-bootstrap/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/products/feature-flagging/feature-flagging-config/gradle.lockfile b/products/feature-flagging/feature-flagging-config/gradle.lockfile index 4c0bd9f56b6..40a31c8e4b8 100644 --- a/products/feature-flagging/feature-flagging-config/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-config/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/products/feature-flagging/feature-flagging-lib/gradle.lockfile b/products/feature-flagging/feature-flagging-lib/gradle.lockfile index 5ddd990390d..6d568b29775 100644 --- a/products/feature-flagging/feature-flagging-lib/gradle.lockfile +++ b/products/feature-flagging/feature-flagging-lib/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,test com.blogspot.mydailyjava:weak-lock-free:0.17=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -95,7 +95,6 @@ org.junit.platform:junit-platform-runner:1.14.1=jmhRuntimeClasspath,testRuntimeC org.junit.platform:junit-platform-suite-api:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-suite-commons:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-agent/gradle.lockfile b/products/metrics/metrics-agent/gradle.lockfile index a5338982bf6..80c19f76065 100644 --- a/products/metrics/metrics-agent/gradle.lockfile +++ b/products/metrics/metrics-agent/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-api/build.gradle.kts b/products/metrics/metrics-api/build.gradle.kts index bc995a5c87d..72f26a9d42a 100644 --- a/products/metrics/metrics-api/build.gradle.kts +++ b/products/metrics/metrics-api/build.gradle.kts @@ -1,10 +1,31 @@ plugins { `java-library` id("dd-trace-java.module.internal-api") + id("dd-trace-java.jmh-conventions") } description = "Metrics API" dependencies { implementation(libs.slf4j) + api(project(":components:environment")) + + testImplementation(libs.bundles.junit5) + testImplementation(libs.bundles.mockito) + testImplementation(libs.jol.core) +} + +jmh { + jmhVersion = libs.versions.jmh.get() + duplicateClassesStrategy = DuplicatesStrategy.EXCLUDE } + +extra["excludedClassesCoverage"] = listOf( + "datadog.metrics.api.Monitoring", + "datadog.metrics.api.NoOpCounter", + "datadog.metrics.api.NoOpHistogram", + "datadog.metrics.api.NoOpHistogramsFactory", + "datadog.metrics.api.NoOpMonitoring", + "datadog.metrics.api.NoOpRecording", + "datadog.metrics.api.statsd.NoOpStatsDClient", +) diff --git a/products/metrics/metrics-api/gradle.lockfile b/products/metrics/metrics-api/gradle.lockfile index 03c1dba6b17..7c9d3b12b20 100644 --- a/products/metrics/metrics-api/gradle.lockfile +++ b/products/metrics/metrics-api/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java new file mode 100644 index 00000000000..f5ab5147c1c --- /dev/null +++ b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorBenchmark.java @@ -0,0 +1,515 @@ +package datadog.metrics.api; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; + +import java.util.concurrent.ConcurrentHashMap; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; +import java.util.concurrent.atomic.AtomicLongArray; +import java.util.concurrent.atomic.LongAdder; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.BenchmarkMode; +import org.openjdk.jmh.annotations.Fork; +import org.openjdk.jmh.annotations.Group; +import org.openjdk.jmh.annotations.GroupThreads; +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.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; +import org.openjdk.jmh.infra.Blackhole; + +/** + * {@link Accumulator} vs the alternatives it actually displaces: a single {@code LongAdder} (the + * collision-free baseline it can never beat, only approach), an independent {@code LongAdder} per + * counter guarded by a per-counter lock (the "just fix it with LongAdder" natural migration target + * -- {@code longAdderGroup*}), and the {@code ConcurrentHashMap.computeIfAbsent(key, k -> new + * AtomicLong())} anti-pattern ({@code chmAtomicLongIncrement*}) that {@link Accumulator} exists to + * avoid, and an unstriped {@code AtomicLongArray} ({@code atomicLongArray*}) -- one shared array, + * no per-thread distribution, isolating the cost of striping itself from the cost of correctness + * (see {@link #arrayAccumulateAndReset}). The CHM variant allocates its counter under the bucket's + * bin lock the first time its one constant key is seen, but since the map is a + * {@code @State(Scope.Benchmark)} field shared across the whole run, that allocation happens + * exactly once; every sampled op after it hits the warmed, already-present fast path. So this + * measures steady-state {@code computeIfAbsent} lookup overhead on an already-populated map, not + * the one-time allocation-under-lock cost -- still a useful number (a fixed, small key set that's + * allocated once and hit for the life of the process, as {@code WafMetricCollector}-style CHM + * counters are, spends nearly all its time in this same warmed path), just not the pathology the + * name of this benchmark might suggest. + * + *

{@code longAdderGroup*}: is a "just fix it with LongAdder" helper actually cheaper? + * {@code groupInc}/{@code groupAccumulateAnd} are the natural correct fix using {@code LongAdder} + * as the payload: one {@code LongAdder} per counter, with a per-counter lock guarding both + * the increment and the drain (locking only the drain does nothing -- {@code sumThenReset()}'s + * internal race is against the {@code LongAdder}'s own CAS-based {@code add()}, not against any + * lock a caller takes). The single-counter {@code *_*} benchmarks below collapse that per-counter + * lock to one lock shared by every thread -- the degenerate worst case for {@code longAdderGroup}, + * with no thread-based distribution at all. The {@code *8_*} benchmarks fix that: each JMH worker + * thread is pinned to one of 8 counters for its lifetime (see {@link #threadCounterIndex}), so + * {@code longAdderGroup8}'s threads split into up to 8 groups each contending their own lock -- the + * topology where distributed locking should actually pay off, forcing {@link Accumulator}'s + * thread-striped design to earn its write-side win rather than facing a single-counter worst case. + * Fork(5), 15 samples per benchmark, Apple M1 Max, 10 CPUs - macOS/aarch64 - JDK 25 (Zulu): + * AccumulatorBenchmark.accumulatorAccumulateAndReset_highContention avgt 15 2.760 ± 0.052 us/op + * AccumulatorBenchmark.accumulatorAccumulateAndReset_lowContention avgt 15 0.049 ± 0.001 us/op + * AccumulatorBenchmark.accumulatorAccumulateAndReset8_highContention avgt 15 6.939 ± 0.303 us/op + * AccumulatorBenchmark.accumulatorAccumulateAndReset8_lowContention avgt 15 0.364 ± 0.003 us/op + * AccumulatorBenchmark.accumulatorIncrement_highContention avgt 15 0.009 ± 0.001 us/op + * AccumulatorBenchmark.accumulatorIncrement_lowContention avgt 15 0.007 ± 0.001 us/op + * AccumulatorBenchmark.accumulatorIncrement8_highContention avgt 15 0.016 ± 0.006 us/op + * AccumulatorBenchmark.accumulatorIncrement8_lowContention avgt 15 0.007 ± 0.001 us/op + * AccumulatorBenchmark.longAdderGroupAccumulateAnd_highContention avgt 15 1.703 ± 1.785 us/op + * AccumulatorBenchmark.longAdderGroupAccumulateAnd_lowContention avgt 15 0.024 ± 0.001 us/op + * AccumulatorBenchmark.longAdderGroupAccumulateAnd8_highContention avgt 15 5.989 ± 0.241 us/op + * AccumulatorBenchmark.longAdderGroupAccumulateAnd8_lowContention avgt 15 0.074 ± 0.008 us/op + * AccumulatorBenchmark.longAdderGroupIncrement_highContention avgt 15 2.775 ± 0.531 us/op + * AccumulatorBenchmark.longAdderGroupIncrement_lowContention avgt 15 0.012 ± 0.001 us/op + * AccumulatorBenchmark.longAdderGroupIncrement8_highContention avgt 15 0.513 ± 0.094 us/op + * AccumulatorBenchmark.longAdderGroupIncrement8_lowContention avgt 15 0.012 ± 0.001 us/op + * On the write side, {@link Accumulator} beats {@code longAdderGroup} at high contention by + * ~310x in the degenerate single-shared-lock case and still by ~32x once counters are fairly spread + * across 8 locks -- a large, reproducible win either way, on the call that runs on every event. On + * the drain side, the two designs remain close and the comparison stays noisy under contention for + * both: at width 1 {@link Accumulator}'s drain (2.760 us/op) reads slower than {@code + * longAdderGroup}'s (1.703 ± 1.785 us/op), but that error bar spans {@link Accumulator}'s own + * result, so the two aren't distinguishable at this sample size; at width 8 it's ~1.16x slower + * (6.939 vs 5.989 us/op), consistent with the earlier ~1.14x reading. Reproduced on a second, + * independent Fork(5) run after the stripe-count cap ({@code MAX_STRIPES = 64}) landed: a large, + * robust win on the call that fires on every event, and no confirmed cost on the call that fires + * once per reporting cycle. + * + *

{@code longAdderDelta*}: the fair single-counter baseline. {@code longAdderGroup}'s + * ~310x/~32x win above is real, but it's the cost of buying {@code sumThenReset()}'s no-lost-update + * guarantee via a lock -- not the cost of a single {@code LongAdder} on its own. + * Pre-migration {@code TracerHealthMetrics} never took that lock: it kept a single {@code + * previousCounts}/{@code countIndex}-tracked differ computing {@code sum() - previous} by hand, + * which is already lock-free and never loses an update, because a missed delta on one {@code sum()} + * just shows up whole on the next one (see {@link #deltaSumAndReset}). {@code longAdderDelta_*}/ + * {@code longAdderDeltaMixed_*} below reproduce exactly that pattern -- one {@code LongAdder}, one + * dedicated differ, no lock anywhere -- as the fairest single-counter comparison to {@link + * Accumulator}: both designs give the same no-lost-update guarantee, just by different means + * (per-thread striping vs. a single differ's own unsynchronized bookkeeping), so neither pays for a + * lock the other doesn't need. Fork(5), 15 samples per benchmark, same machine: + * AccumulatorBenchmark.accumulatorAccumulateAndReset_lowContention avgt 15 0.050 ± 0.001 us/op + * AccumulatorBenchmark.accumulatorMixed avgt 15 0.158 ± 0.022 us/op + * AccumulatorBenchmark.accumulatorMixed:accumulatorMixed_drain avgt 15 0.692 ± 0.077 us/op + * AccumulatorBenchmark.accumulatorMixed:accumulatorMixed_write avgt 15 0.024 ± 0.009 us/op + * AccumulatorBenchmark.longAdderDelta_lowContention avgt 15 0.018 ± 0.001 us/op + * AccumulatorBenchmark.longAdderDeltaMixed avgt 15 0.118 ± 0.006 us/op + * AccumulatorBenchmark.longAdderDeltaMixed:longAdderDeltaMixed_drain avgt 15 0.122 ± 0.012 us/op + * AccumulatorBenchmark.longAdderDeltaMixed:longAdderDeltaMixed_write avgt 15 0.117 ± 0.006 us/op + * Here {@link Accumulator} does not win outright. In the single-threaded + * inc-then-diff-per-call shape, the safe {@code LongAdder} delta is ~2.8x cheaper (0.018 vs 0.050 + * us/op) -- no striping to fan out or fold back in when there's only one thread. In the realistic + * many-writers/one-drainer topology ({@code accumulatorMixed} vs {@code longAdderDeltaMixed}), + * {@link Accumulator} wins the write side by ~4.9x (0.024 vs 0.117 us/op, the call on the hot path) + * but loses the drain side by ~5.7x (0.692 vs 0.122 us/op) and the combined total by ~1.34x (0.158 + * vs 0.118 us/op) -- the striping that makes writes cheap has to be folded back together somewhere, + * and that fold costs more than one differ's plain subtraction. + * + *

That's not a mark against {@link Accumulator}: it's the expected shape of a primitive whose + * value isn't raw single-counter throughput. {@link Accumulator}'s real win shows up one level up, + * in a from-scratch before/after of an actual migrated caller -- {@code + * TracerHealthMetricsBenchmark} (see {@code + * dd-trace-core/src/jmh/java/datadog/trace/core/monitor/}), which replaced ~49 individual {@code + * LongAdder} fields and their hand-rolled {@code previousCounts}/{@code countIndex} delta tracking + * with one {@code Accumulator}. There, every hot single-counter call is at + * parity with or faster than the legacy code (0.6-0.7x of legacy on {@code onSend}, the most + * frequent real call site), and the batch drain -- the actual shape {@link Accumulator} is for, + * many counters read and reset together once per reporting cycle -- is where the real-code evidence + * is decisive, not just competitive. The fair single-counter numbers above are worth publishing + * precisely because they're not a clean win: they show {@link Accumulator} doesn't need to dominate + * every synthetic one-counter microbenchmark to be the right call once counters are plural and the + * drain is the thing that matters, which {@code TracerHealthMetricsBenchmark} demonstrates directly + * on real code rather than a synthetic stand-in. + */ +@State(Scope.Benchmark) +@Warmup(iterations = 1, time = 10) +@Measurement(iterations = 3, time = 10) +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(MICROSECONDS) +@Fork(5) +public class AccumulatorBenchmark { + + enum Counter { + HITS + } + + /** + * An 8-constant counterpart to {@link Counter}, used only by the {@code *8_*} benchmarks below. + * Unlike {@link Counter}, where every thread hits the single {@code HITS} constant (the worst + * case for {@code longAdderGroup}'s per-counter locking -- one lock shared by every thread, + * regardless of core count), these benchmarks spread writes across all 8 constants: each JMH + * worker thread is pinned to one fixed counter for its lifetime (see {@link + * #threadCounterIndex}), so under high contention, threads split into up to 8 groups each + * contending on their own lock instead of all threads sharing one. This is the topology where + * {@code longAdderGroup}'s distributed locking should actually pay off, and where {@link + * Accumulator}'s thread-striped design has to earn its win on the write side rather than facing a + * single-counter worst case. {@code accumulateAndReset}/{@code groupAccumulateAnd} also now walk + * 8 slots per drain instead of 1, sizing the drain cost closer to {@code TracerHealthMetric}'s + * 54-constant production shape. + */ + enum Counter8 { + COUNTER_0, + COUNTER_1, + COUNTER_2, + COUNTER_3, + COUNTER_4, + COUNTER_5, + COUNTER_6, + COUNTER_7 + } + + private static final Counter8[] COUNTER8_VALUES = Counter8.values(); + + private final LongAdder adder = new LongAdder(); + private final LongAdder deltaAdder = new LongAdder(); + private long deltaPrevious; + private final Accumulator accumulator = Accumulator.of(Counter.class); + private final Accumulator accumulator8 = Accumulator.of(Counter8.class); + private final ConcurrentHashMap chm = new ConcurrentHashMap<>(); + private final AtomicLongArray atomicLongArray = new AtomicLongArray(1); + private final AtomicLongArray atomicLongArray8 = new AtomicLongArray(8); + private final LongAdder[] longAdderGroup = {new LongAdder()}; + private final LongAdder[] longAdderGroup8 = { + new LongAdder(), + new LongAdder(), + new LongAdder(), + new LongAdder(), + new LongAdder(), + new LongAdder(), + new LongAdder(), + new LongAdder() + }; + + /** + * Assigns each JMH worker thread a fixed {@code Counter8} index (round-robin over 8) the first + * time it calls into any {@code *8_*} benchmark, and keeps returning that same index for the + * thread's lifetime -- so under {@code Threads.MAX}, writes spread across all 8 counters instead + * of every thread hammering one. + */ + private final AtomicInteger threadIndexAssigner = new AtomicInteger(); + + private final ThreadLocal threadCounterIndex = + ThreadLocal.withInitial(() -> threadIndexAssigner.getAndIncrement() % COUNTER8_VALUES.length); + + /** + * The natural "just use LongAdder" fix for the reset hazard: one {@code LongAdder} per counter, + * with a per-counter lock guarding both the increment and the drain -- external locking around + * only the drain does nothing, since {@code sumThenReset()}'s internal race is against the {@code + * LongAdder}'s own CAS-based {@code add()}, not against any lock a caller takes. This is the fair + * comparison point: it closes the same reset hazard {@link Accumulator} does, but stripes by + * counter (one lock per enum constant) instead of by thread (one shared table + * across all counters) -- so N threads hammering the *same* counter contend on one lock + * regardless of core count, with no thread-bucket distribution at all. + */ + private static void groupInc(LongAdder[] group, int ordinal) { + LongAdder counter = group[ordinal]; + synchronized (counter) { + counter.add(1L); + } + } + + private static long[] groupAccumulateAnd(LongAdder[] group) { + long[] acc = new long[group.length]; + for (int i = 0; i < group.length; i++) { + LongAdder counter = group[i]; + synchronized (counter) { + acc[i] = counter.sumThenReset(); + } + } + return acc; + } + + /** + * The unstriped baseline: a single shared {@code AtomicLongArray}, one slot per counter, with no + * per-thread distribution at all -- isolates the cost of {@link Accumulator}'s thread-striping + * itself from the cost of correctness (unlike {@code longAdderGroup}, this has no lock: {@code + * getAndAdd} and {@code getAndSet} are each already atomic per-slot, so no coordination is needed + * to give the same "no increment lost across a drain" guarantee). + */ + private static long[] arrayAccumulateAndReset(AtomicLongArray array) { + long[] acc = new long[array.length()]; + for (int i = 0; i < array.length(); i++) { + acc[i] = array.getAndSet(i, 0L); + } + return acc; + } + + /** + * The safe, lock-free alternative to {@code sumThenReset()} that pre-migration {@code + * TracerHealthMetrics} actually used (via {@code previousCounts}/{@code countIndex}): never reset + * the {@code LongAdder} at all, and have a single differ thread track the last observed {@code + * sum()} to compute its own delta. {@code sum()} alone never loses an update permanently -- a + * miss just shows up in the next {@code sum()} -- so this closes {@code sumThenReset()}'s reset + * race without any lock, at the cost of one extra subtraction per drain. The catch is the "single + * differ" part: {@code deltaPrevious} is unsynchronized plain state, correct only because exactly + * one thread ever calls this method between increments. Unlike {@code sumThenReset()}, which + * degrades gracefully (just an occasional dropped delta) if called from multiple threads at once, + * concurrent callers here would race on {@code deltaPrevious} itself and corrupt it -- so there + * is deliberately no {@code longAdderDelta_highContention} mirroring {@code + * longAdderSumThenReset_highContention}'s "every thread both writes and drains" shape; see {@code + * longAdderDeltaMixed_write}/{@code _drain} below for the one topology (many writers, one + * dedicated drainer) this baseline is actually valid under. + */ + private long deltaSumAndReset() { + long current = deltaAdder.sum(); + long delta = current - deltaPrevious; + deltaPrevious = current; + return delta; + } + + @Benchmark + @Threads(1) + public void longAdderIncrement_lowContention() { + adder.increment(); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderIncrement_highContention() { + adder.increment(); + } + + @Benchmark + @Threads(1) + public void accumulatorIncrement_lowContention() { + accumulator.inc(Counter.HITS); + } + + @Benchmark + @Threads(Threads.MAX) + public void accumulatorIncrement_highContention() { + accumulator.inc(Counter.HITS); + } + + @Benchmark + @Threads(1) + public void chmAtomicLongIncrement_lowContention() { + chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet(); + } + + @Benchmark + @Threads(Threads.MAX) + public void chmAtomicLongIncrement_highContention() { + chm.computeIfAbsent("hits", k -> new AtomicLong()).incrementAndGet(); + } + + @Benchmark + @Threads(1) + public void longAdderSumThenReset_lowContention(Blackhole blackhole) { + adder.increment(); + blackhole.consume(adder.sumThenReset()); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderSumThenReset_highContention(Blackhole blackhole) { + adder.increment(); + blackhole.consume(adder.sumThenReset()); + } + + @Benchmark + @Threads(1) + public void longAdderDelta_lowContention(Blackhole blackhole) { + deltaAdder.increment(); + blackhole.consume(deltaSumAndReset()); + } + + /** + * The realistic, valid topology for {@link #deltaSumAndReset} -- many writers, one dedicated + * differ -- mirroring {@code accumulatorMixed_write}/{@code _drain} below so the two can be + * compared directly: this is the fairest single-counter match for {@link Accumulator}, since both + * are lock-free on the write side and both give the same no-lost-update guarantee, just by + * different means (per-slot atomic {@code getAndSet} vs. a single differ's own bookkeeping). + */ + @Benchmark + @Group("longAdderDeltaMixed") + @GroupThreads(4) + public void longAdderDeltaMixed_write() { + deltaAdder.increment(); + } + + @Benchmark + @Group("longAdderDeltaMixed") + @GroupThreads(1) + public void longAdderDeltaMixed_drain(Blackhole blackhole) { + blackhole.consume(deltaSumAndReset()); + } + + @Benchmark + @Threads(1) + public void accumulatorAccumulateAndReset_lowContention(Blackhole blackhole) { + accumulator.inc(Counter.HITS); + blackhole.consume(accumulator.accumulateAndReset()); + } + + /** + * A deliberately pessimistic topology: every thread both writes and drains on every op, so {@code + * Threads.MAX} threads are all draining concurrently. Real callers don't do this -- see {@code + * accumulatorMixed-write}/{@code accumulatorMixed-drain} below for the "many writers, one rare + * drainer" shape this class actually targets. Kept as the worst-case upper bound: no production + * topology should be more contended on {@link Accumulator#accumulateAndReset} than this. + */ + @Benchmark + @Threads(Threads.MAX) + public void accumulatorAccumulateAndReset_highContention(Blackhole blackhole) { + accumulator.inc(Counter.HITS); + blackhole.consume(accumulator.accumulateAndReset()); + } + + /** + * The realistic counterpart to {@code accumulatorAccumulateAndReset_highContention}: many writer + * threads incrementing, and a single dedicated thread polling {@link + * Accumulator#accumulateAndReset} -- not every thread doing both on every op. {@code + * accumulatorMixed-write} measures increment cost while a drain is actively running; {@code + * accumulatorMixed-drain} measures the drain's own cost under that same live write pressure. The + * 4:1 writer:drainer ratio is illustrative of "many writers, rare drain," not tuned to a specific + * core count. + */ + @Benchmark + @Group("accumulatorMixed") + @GroupThreads(4) + public void accumulatorMixed_write() { + accumulator.inc(Counter.HITS); + } + + @Benchmark + @Group("accumulatorMixed") + @GroupThreads(1) + public void accumulatorMixed_drain(Blackhole blackhole) { + blackhole.consume(accumulator.accumulateAndReset()); + } + + @Benchmark + @Threads(1) + public void longAdderGroupIncrement_lowContention() { + groupInc(longAdderGroup, Counter.HITS.ordinal()); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderGroupIncrement_highContention() { + groupInc(longAdderGroup, Counter.HITS.ordinal()); + } + + @Benchmark + @Threads(1) + public void longAdderGroupAccumulateAnd_lowContention(Blackhole blackhole) { + groupInc(longAdderGroup, Counter.HITS.ordinal()); + blackhole.consume(groupAccumulateAnd(longAdderGroup)); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderGroupAccumulateAnd_highContention(Blackhole blackhole) { + groupInc(longAdderGroup, Counter.HITS.ordinal()); + blackhole.consume(groupAccumulateAnd(longAdderGroup)); + } + + @Benchmark + @Threads(1) + public void atomicLongArrayIncrement_lowContention() { + atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L); + } + + @Benchmark + @Threads(Threads.MAX) + public void atomicLongArrayIncrement_highContention() { + atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L); + } + + @Benchmark + @Threads(1) + public void atomicLongArrayAccumulateAndReset_lowContention(Blackhole blackhole) { + atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L); + blackhole.consume(arrayAccumulateAndReset(atomicLongArray)); + } + + @Benchmark + @Threads(Threads.MAX) + public void atomicLongArrayAccumulateAndReset_highContention(Blackhole blackhole) { + atomicLongArray.getAndAdd(Counter.HITS.ordinal(), 1L); + blackhole.consume(arrayAccumulateAndReset(atomicLongArray)); + } + + @Benchmark + @Threads(1) + public void atomicLongArrayIncrement8_lowContention() { + atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L); + } + + @Benchmark + @Threads(Threads.MAX) + public void atomicLongArrayIncrement8_highContention() { + atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L); + } + + @Benchmark + @Threads(1) + public void atomicLongArrayAccumulateAndReset8_lowContention(Blackhole blackhole) { + atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L); + blackhole.consume(arrayAccumulateAndReset(atomicLongArray8)); + } + + @Benchmark + @Threads(Threads.MAX) + public void atomicLongArrayAccumulateAndReset8_highContention(Blackhole blackhole) { + atomicLongArray8.getAndAdd(threadCounterIndex.get(), 1L); + blackhole.consume(arrayAccumulateAndReset(atomicLongArray8)); + } + + @Benchmark + @Threads(1) + public void accumulatorIncrement8_lowContention() { + accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]); + } + + @Benchmark + @Threads(Threads.MAX) + public void accumulatorIncrement8_highContention() { + accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]); + } + + @Benchmark + @Threads(1) + public void accumulatorAccumulateAndReset8_lowContention(Blackhole blackhole) { + accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]); + blackhole.consume(accumulator8.accumulateAndReset()); + } + + @Benchmark + @Threads(Threads.MAX) + public void accumulatorAccumulateAndReset8_highContention(Blackhole blackhole) { + accumulator8.inc(COUNTER8_VALUES[threadCounterIndex.get()]); + blackhole.consume(accumulator8.accumulateAndReset()); + } + + @Benchmark + @Threads(1) + public void longAdderGroupIncrement8_lowContention() { + groupInc(longAdderGroup8, threadCounterIndex.get()); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderGroupIncrement8_highContention() { + groupInc(longAdderGroup8, threadCounterIndex.get()); + } + + @Benchmark + @Threads(1) + public void longAdderGroupAccumulateAnd8_lowContention(Blackhole blackhole) { + groupInc(longAdderGroup8, threadCounterIndex.get()); + blackhole.consume(groupAccumulateAnd(longAdderGroup8)); + } + + @Benchmark + @Threads(Threads.MAX) + public void longAdderGroupAccumulateAnd8_highContention(Blackhole blackhole) { + groupInc(longAdderGroup8, threadCounterIndex.get()); + blackhole.consume(groupAccumulateAnd(longAdderGroup8)); + } +} diff --git a/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java new file mode 100644 index 00000000000..46306a4fffc --- /dev/null +++ b/products/metrics/metrics-api/src/jmh/java/datadog/metrics/api/AccumulatorVsCounterBenchmark.java @@ -0,0 +1,192 @@ +package datadog.metrics.api; + +import static java.util.concurrent.TimeUnit.MICROSECONDS; + +import datadog.metrics.api.statsd.StatsDClient; +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.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.annotations.Threads; +import org.openjdk.jmh.annotations.Warmup; + +/** + * A decision-support benchmark, not a design-proof one: {@link AccumulatorBenchmark} exists to + * justify {@link Accumulator}'s internal striping design against synthetic alternatives ({@code + * LongAdder}, a CHM of {@code AtomicLong}, an unstriped {@code AtomicLongArray}) that nobody in + * this codebase would actually reach for instead -- that question is settled and doesn't need + * re-litigating on every read. This class answers a different, durable one: given both {@link + * Counter} and {@link Accumulator} live in {@code metrics-api}, which do you actually use? + * + *

{@link Counter} is the one most callers reach for first, and for good reason -- it's the + * advertised, general-purpose metrics API. But its real implementation ({@code StatsDCounter} in + * {@code metrics-lib}) calls {@link StatsDClient#count} synchronously on every {@link + * Counter#increment}, with no batching or striping of its own, and the real {@code StatsDClient} + * underneath serializes that call through one shared connection (a lock or an offer to a single + * queue) -- the same "one shared serialization point, no thread distribution" shape {@link + * AccumulatorBenchmark}'s {@code longAdderGroup} single-lock variants model. {@link + * #counterIncrement} below mirrors that shape with a {@link StatsDClient} that takes a real lock on + * every call (see {@link LockingStatsDClient}) rather than a true no-op -- a true no-op measures + * only virtual-dispatch overhead and understates {@code StatsDCounter}'s actual per-call cost to + * the point of not answering this benchmark's own question ({@code StatsDCounter} itself has + * package-private construction, so this reimplements its shape rather than depending on {@code + * metrics-lib}). {@link Accumulator} exists because that per-call cost is too high to pay on every + * request/span/event -- it stripes by thread and defers reporting to a periodic drain instead. + * + *

Rule of thumb: a counter incremented on a hot path (every request, span, or event) + * should use {@link Accumulator}, drained on a reporting cadence. A counter incremented rarely + * (startup, config changes, an error path already off the hot path) can use {@link Counter} + * directly, no ceremony required. This is the concrete case behind the (not yet built) + * {@code @ForegroundSafe}/{@code @BackgroundOnly} annotations: {@link Counter#increment} is + * {@code @BackgroundOnly}, {@link Accumulator#inc} is {@code @ForegroundSafe}. + * + *

Fork(5), 15 samples per benchmark, Apple M1 Max, 10 CPUs - macOS/aarch64 - JDK 25 (Zulu): + * + * AccumulatorVsCounterBenchmark.accumulatorIncrement_highContention avgt 15 0.009 ± 0.001 us/op + * AccumulatorVsCounterBenchmark.accumulatorIncrement_lowContention avgt 15 0.007 ± 0.001 us/op + * AccumulatorVsCounterBenchmark.counterIncrement_highContention avgt 15 1.559 ± 0.941 us/op + * AccumulatorVsCounterBenchmark.counterIncrement_lowContention avgt 15 0.009 ± 0.001 us/op + * At low contention the two are indistinguishable (0.007 vs 0.009 us/op) -- an uncontended + * lock costs almost nothing, so with only one thread ever calling in, {@link Counter}'s per-call + * cost and {@link Accumulator}'s are both dominated by the same handful of instructions. At high + * contention {@link Accumulator} wins by ~173x (0.009 vs 1.559 us/op, itself high-variance from run + * to run) -- {@link Counter}'s one shared lock serializes every calling thread, while {@link + * Accumulator}'s per-thread striping doesn't. This is the expected result for a counter hit from + * many concurrent threads, and it's why the Rule of thumb above exists. + * + *

What this does and doesn't measure. {@link LockingStatsDClient} is a conservative + * synthetic lower bound on {@link Counter}'s real cost, not a measurement of exact production + * overhead -- a real {@code StatsDClient} also encodes the metric line and offers it to a queue (or + * blocks on socket I/O) under that same lock/queue, work this stand-in skips entirely. That means + * the true gap between {@link Counter} and {@link Accumulator} at high contention in production is + * at least as large as the ~173x shown here, quite possibly larger; this benchmark establishes a + * floor, not a ceiling, on the win. + */ +@State(Scope.Benchmark) +@Warmup(iterations = 1, time = 10) +@Measurement(iterations = 3, time = 10) +@BenchmarkMode(Mode.AverageTime) +@OutputTimeUnit(MICROSECONDS) +@Fork(5) +public class AccumulatorVsCounterBenchmark { + + enum Metric { + HITS + } + + private final Accumulator accumulator = Accumulator.of(Metric.class); + private final Counter counter = new SynchronousStatsDCounter("hits", new LockingStatsDClient()); + + /** + * Mirrors {@code StatsDCounter}'s real shape: every {@link #increment} forwards straight to the + * client, with no batching of its own. Reimplemented here rather than depending on {@code + * metrics-lib} because {@code StatsDCounter}'s constructor is package-private. + */ + private static final class SynchronousStatsDCounter implements Counter { + private static final String[] NO_TAGS = new String[0]; + private final String name; + private final StatsDClient statsd; + + SynchronousStatsDCounter(String name, StatsDClient statsd) { + this.name = name; + this.statsd = statsd; + } + + @Override + public void increment(int delta) { + statsd.count(name, delta, NO_TAGS); + } + + @Override + public void incrementErrorCount(String cause, int delta) { + statsd.count(name, delta, new String[] {"cause:" + cause}); + } + } + + /** + * A {@link StatsDClient} stand-in that pays a real, serialized per-call cost instead of a true + * no-op: every real {@code StatsDClient} forwards {@code count} through one shared connection (a + * lock or an offer to a single non-blocking queue), so a true no-op would measure only + * virtual-dispatch overhead and understate the cost this benchmark exists to isolate. A {@code + * synchronized} increment of a shared counter is a reasonable stand-in for that shared + * serialization point without pulling in a real socket/queue implementation this benchmark + * doesn't need. + */ + private static final class LockingStatsDClient implements StatsDClient { + private final Object lock = new Object(); + private long total; + + @Override + public void incrementCounter(String metricName, String... tags) { + count(metricName, 1L, tags); + } + + @Override + public void count(String metricName, long delta, String... tags) { + synchronized (lock) { + total += delta; + } + } + + @Override + public void gauge(String metricName, long value, String... tags) {} + + @Override + public void gauge(String metricName, double value, String... tags) {} + + @Override + public void histogram(String metricName, long value, String... tags) {} + + @Override + public void histogram(String metricName, double value, String... tags) {} + + @Override + public void distribution(String metricName, long value, String... tags) {} + + @Override + public void distribution(String metricName, double value, String... tags) {} + + @Override + public void serviceCheck( + String serviceCheckName, String status, String message, String... tags) {} + + @Override + public void error(Exception error) {} + + @Override + public int getErrorCount() { + return 0; + } + + @Override + public void close() {} + } + + @Benchmark + @Threads(1) + public void accumulatorIncrement_lowContention() { + accumulator.inc(Metric.HITS); + } + + @Benchmark + @Threads(Threads.MAX) + public void accumulatorIncrement_highContention() { + accumulator.inc(Metric.HITS); + } + + @Benchmark + @Threads(1) + public void counterIncrement_lowContention() { + counter.increment(1); + } + + @Benchmark + @Threads(Threads.MAX) + public void counterIncrement_highContention() { + counter.increment(1); + } +} diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java new file mode 100644 index 00000000000..4f2c618534e --- /dev/null +++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/Accumulator.java @@ -0,0 +1,288 @@ +package datadog.metrics.api; + +import datadog.environment.ThreadSupport; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import java.util.concurrent.atomic.AtomicLongArray; +import javax.annotation.concurrent.ThreadSafe; + +/** + * A striped, lock-free counter primitive keyed by enum ordinal: {@code LongAdder}'s write + * scalability, but as one shared, thread-sharded table instead of one independent {@code LongAdder} + * per counter -- which avoids paying {@code LongAdder}'s per-instance striping overhead {@code + * E.values().length} times over. + * + * 

{@code
+ * enum MyCounters { FOO, BAR }
+ *
+ * Accumulator counters = Accumulator.of(MyCounters.class);
+ * counters.inc(MyCounters.FOO);
+ * counters.add(MyCounters.BAR, 5L);
+ *
+ * Accumulator.Counts drained = counters.accumulateAndReset();
+ * long foo = drained.get(MyCounters.FOO);
+ * }
+ * + *

Each counter's own {@link #accumulateAndReset} slot is read-and-zeroed with a single atomic + * {@code getAndSet}, so -- like {@code Accumulator}'s previous {@code synchronized}-stripe design, + * and unlike {@code LongAdder#sumThenReset()} -- no individual increment can land in the gap + * between summing and zeroing and be silently lost. What's gone is the previous design's + * row-wide atomicity: {@link #inc}/{@link #add} for two different counters are no longer + * guaranteed to be seen together by a concurrent {@link #accumulateAndReset}. There is no {@code + * update}-style escape hatch for grouping several counters under one atomic operation -- callers + * needing that must weigh whether the guarantee was load-bearing (most call sites are logging + * unrelated aspects of the same event, not maintaining a cross-counter invariant a reader depends + * on) or bring their own coordination. + */ +@ThreadSafe +public final class Accumulator> { + /** One full cache line of {@code long}s (64 bytes), used to pad each stripe row. */ + private static final int CACHE_LINE_LONGS = 8; + + /** Upper bound on {@link #stripeCount()}, regardless of core count. */ + private static final int MAX_STRIPES = 64; + + private final AtomicLongArray[] data; + private final int width; + private final E[] keys; + + private Accumulator(AtomicLongArray[] data, int width, E[] keys) { + this.data = data; + this.width = width; + this.keys = keys; + } + + /** + * @param enumType the enum naming each counter, e.g. {@code MyCounters.class} + */ + public static > Accumulator of(Class enumType) { + E[] keys = enumType.getEnumConstants(); + int width = keys.length; + int paddedWidth = paddedWidth(width); + int stripes = stripeCount(); + AtomicLongArray[] data = new AtomicLongArray[stripes]; + for (int i = 0; i < stripes; i++) { + data[i] = new AtomicLongArray(paddedWidth); + } + return new Accumulator<>(data, width, keys); + } + + /** Increments the counter named by {@code key} in the calling thread's stripe by one. */ + public void inc(E key) { + add(key, 1L); + } + + /** Adds {@code delta} to the counter named by {@code key} in the calling thread's stripe. */ + public void add(E key, long delta) { + stripeOf(data).getAndAdd(key.ordinal(), delta); + } + + /** + * Combines and resets every stripe, returning the sum as a typed view. Each counter is + * read-and-zeroed with one atomic {@code getAndSet} -- see the class-level note on what atomicity + * this does and doesn't provide across different counters. + * + * @return the sum, keyed by the enum's {@code ordinal()} + */ + public Counts accumulateAndReset() { + long[] acc = new long[width]; + for (AtomicLongArray stripe : data) { + for (int i = 0; i < width; i++) { + acc[i] += stripe.getAndSet(i, 0L); + } + } + return new Counts<>(acc, keys); + } + + /** + * Combines every stripe without resetting it, returning the sum as a typed view -- a live, + * non-destructive snapshot for a diagnostic read (e.g. {@code summary()}) that must not perturb + * the delta a concurrent {@link #accumulateAndReset} on a reporting cadence is about to report. + * + * @return the sum, keyed by the enum's {@code ordinal()} + */ + public Counts sum() { + long[] acc = new long[width]; + for (AtomicLongArray stripe : data) { + for (int i = 0; i < width; i++) { + acc[i] += stripe.get(i); + } + } + return new Counts<>(acc, keys); + } + + /** + * A typed view over a drained snapshot, returned by {@link #accumulateAndReset} or {@link #sum}: + * the same enum-ordinal type checking {@link Accumulator} provides on writes, applied to the read + * side too. + */ + public static final class Counts> { + private final long[] counts; + private final E[] keys; + + private Counts(long[] counts, E[] keys) { + this.counts = counts; + this.keys = keys; + } + + /** + * An all-zero {@link Counts}, sized for {@code enumType} -- for seeding a running total before + * any real drain has happened, without needing a scratch {@link Accumulator} just to call + * {@link Accumulator#sum()} on it. + * + * @param enumType the enum naming each counter, e.g. {@code MyCounters.class} + */ + public static > Counts create(Class enumType) { + E[] keys = enumType.getEnumConstants(); + return new Counts<>(new long[keys.length], keys); + } + + /** The counter named by {@code key}. */ + public long get(E key) { + return counts[key.ordinal()]; + } + + /** + * The enum constants this {@link Counts} is keyed by, in declaration order -- for a caller that + * wants to iterate every counter (e.g. reporting each one) without separately having to pass + * {@code E.values()} alongside this object. An unmodifiable view over the same backing array + * every {@link Counts} from the same {@link Accumulator} shares -- no copy, but a caller can't + * corrupt that shared array's ordering for every other snapshot the way a raw array reference + * would let it. + */ + public List keys() { + return Collections.unmodifiableList(Arrays.asList(keys)); + } + + /** + * Adds {@code other} to this, key by key, returning a new {@link Counts} rather than mutating + * either input -- combines a stored running total with a fresh, non-destructive {@link #sum} to + * answer "what's the live total right now" without ever resetting anything. + */ + public Counts plus(Counts other) { + long[] combined = counts.clone(); + for (int i = 0; i < combined.length; i++) { + combined[i] += other.counts[i]; + } + return new Counts<>(combined, keys); + } + + /** + * A copy of this {@link Counts} with every entry before {@code keys()[fromIndex]} zeroed out -- + * for a caller that partially delivered a batch downstream and wants to represent "what's left" + * to retry, without re-counting the part that already made it. + */ + public Counts from(int fromIndex) { + long[] remaining = new long[counts.length]; + System.arraycopy(counts, fromIndex, remaining, fromIndex, counts.length - fromIndex); + return new Counts<>(remaining, keys); + } + } + + /** + * An opt-in, safe-by-default composition for the one recurring shape {@link Accumulator} itself + * deliberately doesn't try to make safe on its own: a periodic destructive drain for reporting + * (e.g. to statsd) alongside a separate, non-destructive live read for diagnostics (e.g. a {@code + * summary()} or {@code toString()}). Read independently, {@link #drain} and {@link #live} are + * each individually correct -- the hazard is between them: a {@link #live} call landing between a + * {@link #drain}'s reset and its caller publishing the delta into a running total would combine + * the pre-publish total with the post-drain (zeroed) {@link #sum}, silently under-reporting by + * the just-drained delta. {@code RunningTotal} closes that gap with one lock shared by {@link + * #drain} and {@link #live} -- most callers don't need this (a plain drain-only reporter, or a + * live-read-only diagnostic, needs no coordination at all), so it's a separate, opt-in type + * rather than baked into every {@link Accumulator}. + */ + @ThreadSafe + public static final class RunningTotal> { + private final Accumulator accumulator; + private final Object lock = new Object(); + private Counts total; + + private RunningTotal(Accumulator accumulator) { + this.accumulator = accumulator; + // accumulateAndReset(), not sum() -- sum() doesn't reset, so seeding from it would double + // count whatever's already there once a later live() adds a fresh sum() on top of it. + this.total = accumulator.accumulateAndReset(); + } + + /** + * Wraps {@code accumulator}, seeding the running total from a drain of whatever it currently + * holds. That seed becomes visible through {@link #live}, but -- being folded in at + * construction, before any caller can observe it -- it is never returned by a later {@link + * #drain}. A caller that reports each {@link #drain} delta (e.g. to statsd) would therefore + * silently never report pre-existing counts. Always construct this from a freshly created + * {@code accumulator} (as every current caller does) so there is nothing to seed. + */ + public static > RunningTotal of(Accumulator accumulator) { + return new RunningTotal<>(accumulator); + } + + /** + * Atomically drains the accumulator and folds the delta into the running total -- call this + * right before reporting the delta to a downstream sink on a reporting cadence. + * + * @return the delta just drained + */ + public Counts drain() { + synchronized (lock) { + Counts delta = accumulator.accumulateAndReset(); + total = total.plus(delta); + return delta; + } + } + + /** + * The live total: the running total as of the last {@link #drain}, folded with whatever's + * accumulated since -- never resets anything, safe to call at any time without perturbing a + * concurrent {@link #drain}. + */ + public Counts live() { + synchronized (lock) { + return total.plus(accumulator.sum()); + } + } + } + + /** + * The calling thread's stripe: cheap masking, no allocation, no map lookup. + * + *

Multiple threads can map to the same stripe (this is masking, not a bijection); each + * counter's own atomic slot makes that safe, just not maximally scalable under a hash collision. + */ + private static AtomicLongArray stripeOf(AtomicLongArray[] data) { + int mask = data.length - 1; + int idx = (int) (ThreadSupport.threadId() & mask); + return data[idx]; + } + + /** + * A fixed, power-of-two stripe count deliberately oversized to roughly 2x {@link + * Runtime#availableProcessors()} (minimum 4, maximum {@link #MAX_STRIPES}). Not exposed as a + * per-call override: a mandatory sizing knob on every caller fails the "print test" of + * self-explanatory API design. + * + *

Sizing to exactly the core count leaves stripe collisions likely under real contention + * (birthday-paradox math: with {@code n} contending threads and {@code m} stripes, expected + * colliding pairs are {@code n(n-1)/(2m)}) -- and a collision costs CAS-retry/cache-line-bounce + * cost, the same problem {@code LongAdder}'s own {@code Cell[]} table exists to avoid. Doubling + * the stripe count roughly halves that collision count for a one-time, per-accumulator memory + * cost, at the price of a slightly more expensive (but far rarer) {@link #accumulateAndReset} + * drain -- the right trade given {@link #inc}/{@link #add} run on every call while {@link + * #accumulateAndReset} runs on a reporting cadence. + * + *

Capped at {@link #MAX_STRIPES} so a single {@link Accumulator} on a very-high-core-count + * host can't grow its fixed table without bound: past that many contending threads, collision + * math has already flattened out, so the memory cost of chasing it further isn't worth paying. + */ + private static int stripeCount() { + int cpus = Runtime.getRuntime().availableProcessors(); + return Math.min(MAX_STRIPES, Math.max(4, 2 * Integer.highestOneBit(Math.max(1, cpus)))); + } + + /** Rounds {@code width} up to a whole number of cache lines, plus one full trailing line. */ + private static int paddedWidth(int width) { + int wholeLines = ((width + CACHE_LINE_LONGS - 1) / CACHE_LINE_LONGS) * CACHE_LINE_LONGS; + return wholeLines + CACHE_LINE_LONGS; + } +} diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java new file mode 100644 index 00000000000..b149b422f4c --- /dev/null +++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCountReporter.java @@ -0,0 +1,122 @@ +package datadog.metrics.api.statsd; + +import datadog.metrics.api.Accumulator; +import java.util.List; +import java.util.function.ToLongFunction; +import javax.annotation.concurrent.ThreadSafe; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +/** + * Owns an {@link Accumulator} plus the periodic destructive-drain-and-report cycle over it: {@link + * #inc}/{@link #add} write straight through to the accumulator, {@link #live} peeks it for a + * diagnostic read, and {@link #flush} drains it and reports the delta to a {@link StatsDClient} -- + * holding onto whatever wasn't delivered and retrying it on the next {@link #flush}, rather than + * losing it. + * + *

This isn't a real transaction: statsd delivery is already best-effort over UDP, so there's no + * rollback on the wire and no way to recover a packet actually lost in transit. It only protects + * against a local exception (a bad client, a malformed tag, a config error -- not a lost packet) + * turning "this flush interval under-reports" into "this delta is gone forever." + * + *

The undelivered remainder is kept as {@link #pending} state on this object, not fed back into + * the {@link Accumulator} -- {@link Accumulator.RunningTotal#drain} already folds every drained + * delta into its cumulative total unconditionally, before delivery is attempted, since that total + * counts real events, independent of whether statsd ever got them. Re-adding the same delta to the + * accumulator would make a later {@link Accumulator.RunningTotal#drain} see it as new and count it + * a second time -- {@link #pending} carries it forward for statsd's benefit only. {@link #flush} is + * assumed single-threaded (it's the body of one periodic scheduled task), so no locking guards it. + */ +@ThreadSafe +public final class StatsDCountReporter & StatsDCounterKey> { + private static final Logger log = LoggerFactory.getLogger(StatsDCountReporter.class); + + private final StatsDClient statsDClient; + private final Accumulator accumulator; + private final Accumulator.RunningTotal runningTotal; + + /** Undelivered from the last {@link #flush}, to retry on the next one; {@code null} if none. */ + private Accumulator.Counts pending; + + /** + * @param enumType the enum naming each counter, e.g. {@code MyCounters.class} + */ + public static & StatsDCounterKey> StatsDCountReporter of( + StatsDClient statsDClient, Class enumType) { + return new StatsDCountReporter<>(statsDClient, Accumulator.of(enumType)); + } + + private StatsDCountReporter(StatsDClient statsDClient, Accumulator accumulator) { + this.statsDClient = statsDClient; + this.accumulator = accumulator; + this.runningTotal = Accumulator.RunningTotal.of(accumulator); + } + + /** Increments the counter named by {@code key} by one. */ + public void inc(E key) { + accumulator.inc(key); + } + + /** Adds {@code delta} to the counter named by {@code key}. */ + public void add(E key, long delta) { + accumulator.add(key, delta); + } + + /** + * The live total -- see {@link Accumulator.RunningTotal#live}. For a diagnostic read (e.g. a + * {@code summary()}), never for deciding what to report: {@link #flush} owns that. + */ + public Accumulator.Counts live() { + return runningTotal.live(); + } + + /** + * Drains the accumulator and reports the delta (plus anything still owed from a prior failed + * attempt), holding onto whatever isn't confirmed delivered this time for the next {@link + * #flush}. + */ + public void flush() { + Accumulator.Counts drained = runningTotal.drain(); + Accumulator.Counts toReport = pending == null ? drained : pending.plus(drained); + pending = report(toReport); + } + + /** + * @return {@code null} if every counter was delivered, otherwise a {@link Accumulator.Counts} + * holding whatever wasn't attempted or confirmed sent + */ + private Accumulator.Counts report(Accumulator.Counts counts) { + List keys = counts.keys(); + for (int i = 0; i < keys.size(); i++) { + E key = keys.get(i); + long delta = counts.get(key); + if (delta != 0) { + try { + statsDClient.count(key.getMetricName(), delta, key.getTags()); + } catch (RuntimeException e) { + log.debug( + "Failed to report {}, compensating {} undelivered counter(s)", + key, + keys.size() - i, + e); + return counts.from(i); + } + } + } + return null; + } + + /** + * Reports every nonzero entry of {@code values}/{@code counts} directly -- no accumulator, no + * compensation. + */ + public static & StatsDCounterKey> void report( + StatsDClient statsDClient, E[] values, ToLongFunction counts) { + for (E value : values) { + long delta = counts.applyAsLong(value); + if (delta != 0) { + statsDClient.count(value.getMetricName(), delta, value.getTags()); + } + } + } +} diff --git a/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java new file mode 100644 index 00000000000..3aadbfc24f5 --- /dev/null +++ b/products/metrics/metrics-api/src/main/java/datadog/metrics/api/statsd/StatsDCounterKey.java @@ -0,0 +1,8 @@ +package datadog.metrics.api.statsd; + +/** A counter identity: the dogstatsd metric name and tags a batch of counts should report under. */ +public interface StatsDCounterKey { + String getMetricName(); + + String[] getTags(); +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java new file mode 100644 index 00000000000..b0b2f7b59fd --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorFootprintTest.java @@ -0,0 +1,140 @@ +package datadog.metrics.api; + +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeFalse; + +import datadog.environment.JavaVirtualMachine; +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.LongAdder; +import org.junit.jupiter.api.BeforeAll; +import org.junit.jupiter.api.Test; +import org.openjdk.jol.info.GraphLayout; + +/** + * Retained-footprint comparison (JOL) for {@link Accumulator} vs the alternative it actually + * displaces: one {@code LongAdder} per counter (there is no multi-counter {@code LongAdder} -- a + * caller wanting N additive counters allocates N of them, one field each, as {@code OtlpTelemetry} + * and {@code PayloadDispatcherImpl} do today). + * + *

A freshly constructed {@code LongAdder} is nearly free -- it holds no {@code Cell[]} table + * until contention forces one -- so comparing fresh instances understates its real cost and + * flatters {@code LongAdder}. {@link Accumulator} pays its full striped array up front, at + * creation, sized for {@link Runtime#availableProcessors()} regardless of whether contention ever + * materializes. The realistic comparison is therefore not fresh-vs-fresh but contended-vs-fresh: + * what each actually costs once the counters they represent are hit by real concurrent writers, as + * they are on the telemetry paths this class targets. + * + *

{@link Accumulator}'s stripe count is fixed at creation (roughly 2x {@link + * Runtime#availableProcessors()}, minimum 4) and does not grow further as more contention arrives + * within it, while every additional concurrently-written {@code LongAdder} keeps paying its own + * {@code Cell[]} growth cost independently. {@code Accumulator}'s up-front cost is the more + * predictable one: fixed at creation, independent of runtime contention, and shared (one striped + * table) across however many counters the caller's enum declares, rather than paid per counter. The + * printed numbers below vary by run/JVM -- see the assertions for the invariants that actually + * matter. + */ +class AccumulatorFootprintTest { + + enum Counters { + REQUESTS, + ERRORS, + RETRIES, + BYTES_SENT + } + + @BeforeAll + static void assumeNotJ9Jvm() { + // JOL's GraphLayout relies on HotSpot-specific Unsafe internals and throws + // IllegalStateException on J9-based JVMs (IBM/Semeru) -- same guard as + // StringIndexFootprintTest / ScopeAndContinuationLayoutTest. + assumeFalse(JavaVirtualMachine.isJ9()); + } + + static long bytes(Object root) { + return GraphLayout.parseInstance(root).totalSize(); + } + + static LongAdder[] freshAdders() { + LongAdder[] adders = new LongAdder[Counters.values().length]; + for (int i = 0; i < adders.length; i++) { + adders[i] = new LongAdder(); + } + return adders; + } + + @Test + void freshFootprint() { + LongAdder[] adders = freshAdders(); + Accumulator accumulator = Accumulator.of(Counters.class); + + long adderBytes = bytes((Object) adders); + long accumulatorBytes = bytes(accumulator); + + System.out.printf( + "fresh: %d LongAdders = %6d bytes, Accumulator = %6d bytes%n", + adders.length, adderBytes, accumulatorBytes); + } + + /** + * Drives real multi-threaded contention against a fresh set of {@code LongAdder}s to force their + * {@code Cell[]} tables to grow, then compares against {@link Accumulator}'s fixed footprint -- + * the realistic comparison, since production callers write to these counters concurrently rather + * than leaving them untouched. + * + *

Cell-table growth is driven by JVM-internal CAS-collision detection, not something this test + * controls directly, so the exact grown size can vary by run/JVM; the one invariant asserted is + * monotonic growth (a contended footprint can only be at least the fresh one). + */ + @Test + void contendedFootprint() throws InterruptedException { + LongAdder[] adders = freshAdders(); + long freshAdderBytes = bytes((Object) adders); + + int threads = Math.min(16, Math.max(4, Runtime.getRuntime().availableProcessors())); + ExecutorService pool = Executors.newFixedThreadPool(threads); + CountDownLatch start = new CountDownLatch(1); + CountDownLatch done = new CountDownLatch(threads); + try { + for (int t = 0; t < threads; t++) { + pool.execute( + () -> { + try { + start.await(); + long deadline = System.nanoTime() + TimeUnit.SECONDS.toNanos(2); + while (System.nanoTime() < deadline) { + for (LongAdder adder : adders) { + adder.increment(); + } + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + done.countDown(); + } + }); + } + start.countDown(); + assertTrue(done.await(30, TimeUnit.SECONDS)); + } finally { + pool.shutdown(); + } + + long contendedAdderBytes = bytes((Object) adders); + Accumulator accumulator = Accumulator.of(Counters.class); + long accumulatorBytes = bytes(accumulator); + + System.out.printf( + "contended: %d LongAdders = %6d bytes, Accumulator = %6d bytes%n", + adders.length, contendedAdderBytes, accumulatorBytes); + + assertTrue( + contendedAdderBytes >= freshAdderBytes, + "contended LongAdder footprint should never shrink below the fresh footprint"); + assertTrue( + accumulatorBytes < contendedAdderBytes, + "Accumulator's fixed footprint should be smaller than N contended LongAdders"); + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java new file mode 100644 index 00000000000..adb203fdd1c --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/AccumulatorTest.java @@ -0,0 +1,296 @@ +package datadog.metrics.api; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.ExecutionException; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.Future; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.TimeoutException; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Test; + +class AccumulatorTest { + + enum Counters { + FOO, + BAR, + BAZ + } + + @Test + void freshAccumulatorSumsToZero() { + Accumulator counters = Accumulator.of(Counters.class); + Accumulator.Counts drained = counters.accumulateAndReset(); + for (Counters c : Counters.values()) { + assertEquals(0L, drained.get(c)); + } + } + + @Test + void incIncrementsByOne() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + counters.inc(Counters.FOO); + counters.inc(Counters.BAR); + + Accumulator.Counts drained = counters.accumulateAndReset(); + assertEquals(2L, drained.get(Counters.FOO)); + assertEquals(1L, drained.get(Counters.BAR)); + assertEquals(0L, drained.get(Counters.BAZ)); + } + + @Test + void addAppliesArbitraryDelta() { + Accumulator counters = Accumulator.of(Counters.class); + counters.add(Counters.BAZ, 41L); + counters.add(Counters.BAZ, 1L); + + Accumulator.Counts drained = counters.accumulateAndReset(); + assertEquals(42L, drained.get(Counters.BAZ)); + } + + @Test + void accumulateAndResetsSoASecondDrainIsZero() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + + Accumulator.Counts first = counters.accumulateAndReset(); + assertEquals(1L, first.get(Counters.FOO)); + + Accumulator.Counts second = counters.accumulateAndReset(); + for (Counters c : Counters.values()) { + assertEquals(0L, second.get(c)); + } + } + + @Test + void concurrentIncrementsAreNotLost() throws InterruptedException { + Accumulator counters = Accumulator.of(Counters.class); + int threadCount = 16; + int incrementsPerThread = 10_000; + + ExecutorService pool = Executors.newFixedThreadPool(threadCount); + CountDownLatch start = new CountDownLatch(1); + CountDownLatch done = new CountDownLatch(threadCount); + try { + for (int t = 0; t < threadCount; t++) { + pool.execute( + () -> { + try { + start.await(); + for (int i = 0; i < incrementsPerThread; i++) { + counters.inc(Counters.FOO); + } + } catch (InterruptedException e) { + Thread.currentThread().interrupt(); + } finally { + done.countDown(); + } + }); + } + start.countDown(); + assertTrue(done.await(30, TimeUnit.SECONDS)); + } finally { + pool.shutdown(); + } + + Accumulator.Counts drained = counters.accumulateAndReset(); + assertEquals((long) threadCount * incrementsPerThread, drained.get(Counters.FOO)); + } + + @Test + void concurrentAccumulateAndDuringWritesNeverExceedsWritten() + throws InterruptedException, ExecutionException, TimeoutException { + Accumulator counters = Accumulator.of(Counters.class); + int threadCount = 8; + int incrementsPerThread = 5_000; + + ExecutorService pool = Executors.newFixedThreadPool(threadCount + 1); + CountDownLatch done = new CountDownLatch(threadCount); + AtomicBoolean stop = new AtomicBoolean(false); + long[] runningTotal = {0L}; + + try { + Future drainer = + pool.submit( + () -> { + while (!stop.get()) { + Accumulator.Counts drained = counters.accumulateAndReset(); + synchronized (runningTotal) { + runningTotal[0] += drained.get(Counters.FOO); + } + } + }); + + for (int t = 0; t < threadCount; t++) { + pool.execute( + () -> { + for (int i = 0; i < incrementsPerThread; i++) { + counters.inc(Counters.FOO); + } + done.countDown(); + }); + } + + assertTrue(done.await(30, TimeUnit.SECONDS)); + stop.set(true); + drainer.get(30, TimeUnit.SECONDS); + + Accumulator.Counts finalDrain = counters.accumulateAndReset(); + synchronized (runningTotal) { + runningTotal[0] += finalDrain.get(Counters.FOO); + } + + assertEquals((long) threadCount * incrementsPerThread, runningTotal[0]); + } finally { + pool.shutdown(); + } + } + + @Test + void sumDoesNotResetStripes() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + + Accumulator.Counts first = counters.sum(); + assertEquals(1L, first.get(Counters.FOO)); + + // sum() didn't reset anything, so a second sum() sees the same total + Accumulator.Counts second = counters.sum(); + assertEquals(1L, second.get(Counters.FOO)); + + // and a real drain afterwards still sees the value sum() didn't consume + Accumulator.Counts drained = counters.accumulateAndReset(); + assertEquals(1L, drained.get(Counters.FOO)); + } + + @Test + void sumReflectsIncrementsMadeAfterAnEarlierSum() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + counters.sum(); + + counters.inc(Counters.FOO); + Accumulator.Counts second = counters.sum(); + assertEquals(2L, second.get(Counters.FOO)); + } + + @Test + void createSeedsAnAllZeroCountsWithoutAScratchAccumulator() { + Accumulator.Counts zero = Accumulator.Counts.create(Counters.class); + assertEquals(0L, zero.get(Counters.FOO)); + assertEquals(0L, zero.get(Counters.BAR)); + + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + + Accumulator.Counts live = zero.plus(counters.sum()); + assertEquals(1L, live.get(Counters.FOO)); + } + + @Test + void countsExposesItsOwnKeysWithoutASeparateValuesArray() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + counters.add(Counters.BAR, 5L); + + Accumulator.Counts drained = counters.accumulateAndReset(); + assertEquals(Counters.values().length, drained.keys().size()); + + long total = 0L; + for (Counters c : drained.keys()) { + total += drained.get(c); + } + assertEquals(6L, total); + } + + @Test + void keysIsUnmodifiable() { + Accumulator counters = Accumulator.of(Counters.class); + Accumulator.Counts drained = counters.accumulateAndReset(); + assertThrows(UnsupportedOperationException.class, () -> drained.keys().set(0, Counters.BAZ)); + } + + @Test + void plusCombinesAStoredRunningTotalWithALiveSumWithoutMutatingEither() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + counters.add(Counters.BAR, 5L); + + // drain once, e.g. as if a reporting cycle already ran and stored this total + Accumulator.Counts storedTotal = counters.accumulateAndReset(); + + // more activity happens after that drain, before the next one + counters.inc(Counters.FOO); + + Accumulator.Counts live = storedTotal.plus(counters.sum()); + assertEquals(2L, live.get(Counters.FOO)); + assertEquals(5L, live.get(Counters.BAR)); + + // neither input was mutated by combining them + assertEquals(1L, storedTotal.get(Counters.FOO)); + assertEquals(1L, counters.sum().get(Counters.FOO)); + } + + @Test + void fromZeroesEveryEntryBeforeTheGivenIndex() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + counters.add(Counters.BAR, 4L); + counters.add(Counters.BAZ, 2L); + + Accumulator.Counts drained = counters.accumulateAndReset(); + Accumulator.Counts remaining = drained.from(Counters.BAR.ordinal()); + + assertEquals(0L, remaining.get(Counters.FOO)); + assertEquals(4L, remaining.get(Counters.BAR)); + assertEquals(2L, remaining.get(Counters.BAZ)); + + // the original Counts is untouched by taking a remainder from it + assertEquals(1L, drained.get(Counters.FOO)); + } + + @Test + void runningTotalSeedsFromTheAccumulatorsCurrentSum() { + Accumulator counters = Accumulator.of(Counters.class); + counters.inc(Counters.FOO); + + Accumulator.RunningTotal runningTotal = Accumulator.RunningTotal.of(counters); + assertEquals(1L, runningTotal.live().get(Counters.FOO)); + } + + @Test + void runningTotalDrainReturnsTheDeltaAndFoldsItIntoTheTotal() { + Accumulator counters = Accumulator.of(Counters.class); + Accumulator.RunningTotal runningTotal = Accumulator.RunningTotal.of(counters); + + counters.inc(Counters.FOO); + Accumulator.Counts delta = runningTotal.drain(); + assertEquals(1L, delta.get(Counters.FOO)); + assertEquals(1L, runningTotal.live().get(Counters.FOO)); + + counters.inc(Counters.FOO); + Accumulator.Counts secondDelta = runningTotal.drain(); + assertEquals(1L, secondDelta.get(Counters.FOO)); + assertEquals(2L, runningTotal.live().get(Counters.FOO)); + } + + @Test + void runningTotalLiveReflectsActivitySinceTheLastDrainWithoutDraining() { + Accumulator counters = Accumulator.of(Counters.class); + Accumulator.RunningTotal runningTotal = Accumulator.RunningTotal.of(counters); + + counters.inc(Counters.FOO); + runningTotal.drain(); + + counters.inc(Counters.FOO); + assertEquals(2L, runningTotal.live().get(Counters.FOO)); + // live() didn't drain anything, so a real drain afterwards still sees the pending increment + assertEquals(1L, runningTotal.drain().get(Counters.FOO)); + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java new file mode 100644 index 00000000000..ae5b4c783bb --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/HistogramsTest.java @@ -0,0 +1,63 @@ +package datadog.metrics.api; + +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.Arrays; +import java.util.List; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; + +class HistogramsTest { + + @AfterEach + void resetFactory() { + Histograms.factory = Histograms.NO_OP; + } + + @Test + void constructorIsUsable() { + assertNotNull(new Histograms()); + } + + @Test + void registerIgnoresNull() { + Histograms.Factory before = Histograms.factory; + Histograms.register(null); + assertSame(before, Histograms.factory); + } + + @Test + void registerReplacesFactory() { + Histograms.Factory factory = mock(Histograms.Factory.class); + Histograms.register(factory); + assertSame(factory, Histograms.factory); + } + + @Test + void staticFactoryMethodsDelegateToRegisteredFactory() { + Histograms.Factory factory = mock(Histograms.Factory.class); + Histogram histogram = mock(Histogram.class); + Histogram logHistogram = mock(Histogram.class); + Histogram histogramWithBins = mock(Histogram.class); + HistogramWithSum histogramWithSum = mock(HistogramWithSum.class); + HistogramWithSum histogramWithSumFromBoundaries = mock(HistogramWithSum.class); + + when(factory.newHistogram()).thenReturn(histogram); + when(factory.newLogHistogram()).thenReturn(logHistogram); + when(factory.newHistogram(0.01, 10)).thenReturn(histogramWithBins); + when(factory.newHistogramWithSum(0.01, 10)).thenReturn(histogramWithSum); + List boundaries = Arrays.asList(1.0, 2.0); + when(factory.newHistogramWithSum(boundaries)).thenReturn(histogramWithSumFromBoundaries); + + Histograms.register(factory); + + assertSame(histogram, Histogram.newHistogram()); + assertSame(logHistogram, Histogram.newLogHistogram()); + assertSame(histogramWithBins, Histogram.newHistogram(0.01, 10)); + assertSame(histogramWithSum, Histogram.newHistogramWithSum(0.01, 10)); + assertSame(histogramWithSumFromBoundaries, Histogram.newHistogramWithSum(boundaries)); + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java new file mode 100644 index 00000000000..a4c4906cd2d --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/RecordingTest.java @@ -0,0 +1,37 @@ +package datadog.metrics.api; + +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; + +class RecordingTest { + + @Test + void closeDelegatesToStop() { + StoppableRecording recording = new StoppableRecording(); + + recording.close(); + + assertTrue(recording.stopped); + } + + private static final class StoppableRecording extends Recording { + boolean stopped; + + @Override + public Recording start() { + return this; + } + + @Override + public void reset() {} + + @Override + public void stop() { + stopped = true; + } + + @Override + public void flush() {} + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java new file mode 100644 index 00000000000..f017a134086 --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/RecordingStatsDClient.java @@ -0,0 +1,63 @@ +package datadog.metrics.api.statsd; + +import java.util.ArrayList; +import java.util.List; + +/** Test fake that records every {@link #count} call for assertion. */ +final class RecordingStatsDClient implements StatsDClient { + + static final class Count { + final String metricName; + final long delta; + final String[] tags; + + Count(String metricName, long delta, String[] tags) { + this.metricName = metricName; + this.delta = delta; + this.tags = tags; + } + } + + final List counts = new ArrayList<>(); + + @Override + public void incrementCounter(String metricName, String... tags) {} + + @Override + public void count(String metricName, long delta, String... tags) { + counts.add(new Count(metricName, delta, tags)); + } + + @Override + public void gauge(String metricName, long value, String... tags) {} + + @Override + public void gauge(String metricName, double value, String... tags) {} + + @Override + public void histogram(String metricName, long value, String... tags) {} + + @Override + public void histogram(String metricName, double value, String... tags) {} + + @Override + public void distribution(String metricName, long value, String... tags) {} + + @Override + public void distribution(String metricName, double value, String... tags) {} + + @Override + public void serviceCheck( + String serviceCheckName, String status, String message, String... tags) {} + + @Override + public void error(Exception error) {} + + @Override + public int getErrorCount() { + return 0; + } + + @Override + public void close() {} +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java new file mode 100644 index 00000000000..e37497e8293 --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientManagerTest.java @@ -0,0 +1,40 @@ +package datadog.metrics.api.statsd; + +import static org.junit.jupiter.api.Assertions.assertSame; + +import org.junit.jupiter.api.Test; + +class StatsDClientManagerTest { + + @Test + void defaultFiveArgOverloadDelegatesWithAggregationEnabled() { + StatsDClient client = StatsDClient.NO_OP; + RecordingStatsDClientManager manager = new RecordingStatsDClientManager(client); + + StatsDClient result = manager.statsDClient("host", 8125, null, "ns", new String[] {"tag"}); + + assertSame(client, result); + assertSame(Boolean.TRUE, manager.lastUseAggregation); + } + + private static final class RecordingStatsDClientManager implements StatsDClientManager { + private final StatsDClient client; + private Boolean lastUseAggregation; + + RecordingStatsDClientManager(StatsDClient client) { + this.client = client; + } + + @Override + public StatsDClient statsDClient( + String host, + Integer port, + String namedPipe, + String namespace, + String[] constantTags, + boolean useAggregation) { + this.lastUseAggregation = useAggregation; + return client; + } + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java new file mode 100644 index 00000000000..9624e7b41bf --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDClientTest.java @@ -0,0 +1,61 @@ +package datadog.metrics.api.statsd; + +import static org.junit.jupiter.api.Assertions.assertNotNull; + +import org.junit.jupiter.api.Test; + +class StatsDClientTest { + + @Test + void noOpConstantIsUsable() { + assertNotNull(StatsDClient.NO_OP); + } + + @Test + void defaultRecordEventIsNoOp() { + StatsDClient client = new MinimalStatsDClient(); + + client.recordEvent("type", "source", "eventName", "message", "tag"); + } + + private static final class MinimalStatsDClient implements StatsDClient { + @Override + public void incrementCounter(String metricName, String... tags) {} + + @Override + public void count(String metricName, long delta, String... tags) {} + + @Override + public void gauge(String metricName, long value, String... tags) {} + + @Override + public void gauge(String metricName, double value, String... tags) {} + + @Override + public void histogram(String metricName, long value, String... tags) {} + + @Override + public void histogram(String metricName, double value, String... tags) {} + + @Override + public void distribution(String metricName, long value, String... tags) {} + + @Override + public void distribution(String metricName, double value, String... tags) {} + + @Override + public void serviceCheck( + String serviceCheckName, String status, String message, String... tags) {} + + @Override + public void error(Exception error) {} + + @Override + public int getErrorCount() { + return 0; + } + + @Override + public void close() {} + } +} diff --git a/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java new file mode 100644 index 00000000000..9324fa62aa3 --- /dev/null +++ b/products/metrics/metrics-api/src/test/java/datadog/metrics/api/statsd/StatsDCountReporterTest.java @@ -0,0 +1,207 @@ +package datadog.metrics.api.statsd; + +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import datadog.metrics.api.Accumulator; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.concurrent.atomic.AtomicBoolean; +import org.junit.jupiter.api.Test; + +class StatsDCountReporterTest { + + private static final String[] TAG_A = {"env:a"}; + private static final String[] TAG_B = {"env:b"}; + + enum Counters implements StatsDCounterKey { + FOO("foo.total", TAG_A), + BAR("bar.total", TAG_A), + SHARED_A("shared.total", TAG_A), + SHARED_B("shared.total", TAG_B); + + private final String metricName; + private final String[] tags; + + Counters(String metricName, String[] tags) { + this.metricName = metricName; + this.tags = tags; + } + + @Override + public String getMetricName() { + return metricName; + } + + @Override + public String[] getTags() { + return tags; + } + } + + @Test + void reportsNonZeroCounterWithItsOwnMetricNameAndTags() { + RecordingStatsDClient statsD = new RecordingStatsDClient(); + Map deltas = new HashMap<>(); + deltas.put(Counters.FOO, 3L); + + StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L)); + + assertEquals(1, statsD.counts.size()); + RecordingStatsDClient.Count count = statsD.counts.get(0); + assertEquals("foo.total", count.metricName); + assertEquals(3L, count.delta); + assertArrayEquals(TAG_A, count.tags); + } + + @Test + void skipsZeroDeltaCounters() { + RecordingStatsDClient statsD = new RecordingStatsDClient(); + + StatsDCountReporter.report(statsD, Counters.values(), c -> 0L); + + assertTrue(statsD.counts.isEmpty()); + } + + @Test + void reportsNothingWhenEveryCounterIsZero() { + RecordingStatsDClient statsD = new RecordingStatsDClient(); + Map deltas = new HashMap<>(); + + StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L)); + + assertTrue(statsD.counts.isEmpty()); + } + + @Test + void reportsConstantsSharingAMetricNameIndependentlyByTag() { + RecordingStatsDClient statsD = new RecordingStatsDClient(); + Map deltas = new HashMap<>(); + deltas.put(Counters.SHARED_A, 5L); + deltas.put(Counters.SHARED_B, 7L); + + StatsDCountReporter.report(statsD, Counters.values(), c -> deltas.getOrDefault(c, 0L)); + + assertEquals(2, statsD.counts.size()); + RecordingStatsDClient.Count a = statsD.counts.get(0); + RecordingStatsDClient.Count b = statsD.counts.get(1); + assertEquals("shared.total", a.metricName); + assertEquals(5L, a.delta); + assertArrayEquals(TAG_A, a.tags); + assertEquals("shared.total", b.metricName); + assertEquals(7L, b.delta); + assertArrayEquals(TAG_B, b.tags); + } + + @Test + void flushDrainsAndReportsWithoutPerturbingTheCumulativeLiveTotal() { + RecordingStatsDClient statsD = new RecordingStatsDClient(); + StatsDCountReporter reporter = StatsDCountReporter.of(statsD, Counters.class); + reporter.inc(Counters.FOO); + reporter.add(Counters.BAR, 4L); + + reporter.flush(); + + assertEquals(2, statsD.counts.size()); + // live() is a cumulative total (real events observed), not "since the last flush" -- it + // doesn't reset just because a flush drained and reported the delta. + Accumulator.Counts live = reporter.live(); + assertEquals(1L, live.get(Counters.FOO)); + assertEquals(4L, live.get(Counters.BAR)); + + reporter.flush(); + + // a second flush with nothing new to report doesn't inflate the cumulative total either. + assertEquals(2, statsD.counts.size()); + live = reporter.live(); + assertEquals(1L, live.get(Counters.FOO)); + assertEquals(4L, live.get(Counters.BAR)); + } + + @Test + void flushCompensatesCountersNotConfirmedDeliveredAfterAnException() { + List delivered = new ArrayList<>(); + AtomicBoolean failNextBar = new AtomicBoolean(true); + StatsDClient failsOnBarOnce = + new StatsDClient() { + @Override + public void incrementCounter(String metricName, String... tags) {} + + @Override + public void count(String metricName, long delta, String... tags) { + if (metricName.equals("bar.total") && failNextBar.compareAndSet(true, false)) { + throw new RuntimeException("boom"); + } + delivered.add(new RecordingStatsDClient.Count(metricName, delta, tags)); + } + + @Override + public void gauge(String metricName, long value, String... tags) {} + + @Override + public void gauge(String metricName, double value, String... tags) {} + + @Override + public void histogram(String metricName, long value, String... tags) {} + + @Override + public void histogram(String metricName, double value, String... tags) {} + + @Override + public void distribution(String metricName, long value, String... tags) {} + + @Override + public void distribution(String metricName, double value, String... tags) {} + + @Override + public void serviceCheck( + String serviceCheckName, String status, String message, String... tags) {} + + @Override + public void error(Exception error) {} + + @Override + public int getErrorCount() { + return 0; + } + + @Override + public void close() {} + }; + + StatsDCountReporter reporter = StatsDCountReporter.of(failsOnBarOnce, Counters.class); + reporter.inc(Counters.FOO); + reporter.add(Counters.BAR, 4L); + reporter.add(Counters.SHARED_A, 2L); + + reporter.flush(); + + assertEquals(1, delivered.size()); + assertEquals("foo.total", delivered.get(0).metricName); + + // the cumulative live total counts every real event exactly once, whether or not statsd ever + // received it -- compensating for the failed send must not inflate this. + Accumulator.Counts live = reporter.live(); + assertEquals(1L, live.get(Counters.FOO)); + assertEquals(4L, live.get(Counters.BAR)); + assertEquals(2L, live.get(Counters.SHARED_A)); + + delivered.clear(); + reporter.flush(); + + assertEquals(2, delivered.size()); + assertEquals("bar.total", delivered.get(0).metricName); + assertEquals(4L, delivered.get(0).delta); + assertEquals("shared.total", delivered.get(1).metricName); + assertEquals(2L, delivered.get(1).delta); + + // still exactly-once in the cumulative total after the retry succeeds. + live = reporter.live(); + assertEquals(1L, live.get(Counters.FOO)); + assertEquals(4L, live.get(Counters.BAR)); + assertEquals(2L, live.get(Counters.SHARED_A)); + } +} diff --git a/products/metrics/metrics-lib/gradle.lockfile b/products/metrics/metrics-lib/gradle.lockfile index e91d8e52775..1cb795be1eb 100644 --- a/products/metrics/metrics-lib/gradle.lockfile +++ b/products/metrics/metrics-lib/gradle.lockfile @@ -4,6 +4,7 @@ # 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-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -16,8 +17,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -66,7 +67,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-api/gradle.lockfile b/remote-config/remote-config-api/gradle.lockfile index 44b96794ce4..e22d5794d2f 100644 --- a/remote-config/remote-config-api/gradle.lockfile +++ b/remote-config/remote-config-api/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/remote-config/remote-config-core/gradle.lockfile b/remote-config/remote-config-core/gradle.lockfile index 7515da51af1..4731ab0edad 100644 --- a/remote-config/remote-config-core/gradle.lockfile +++ b/remote-config/remote-config-core/gradle.lockfile @@ -7,10 +7,11 @@ cafe.cryptography:ed25519-elisabeth:0.1.0=compileClasspath,runtimeClasspath,test 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.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -68,7 +69,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/telemetry/gradle.lockfile b/telemetry/gradle.lockfile index 31c84093ca5..62e4ae6641b 100644 --- a/telemetry/gradle.lockfile +++ b/telemetry/gradle.lockfile @@ -9,7 +9,7 @@ ch.qos.logback:logback-core:1.2.13=jmhRuntimeClasspath,testCompileClasspath,test com.blogspot.mydailyjava:weak-lock-free:0.17=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okhttp3:okhttp:3.12.15=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq.okio:okio:1.17.6=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath +com.datadoghq:dd-instrument-java:0.0.5=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath com.datadoghq:java-dogstatsd-client:4.4.5=jmhRuntimeClasspath,testRuntimeClasspath com.datadoghq:sketches-java:0.8.3=jmhRuntimeClasspath,testRuntimeClasspath @@ -22,8 +22,8 @@ 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.10.3=compileClasspath,jmhCompileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,jmhCompileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -77,7 +77,6 @@ org.junit.platform:junit-platform-commons:1.14.1=jmhRuntimeClasspath,testCompile org.junit.platform:junit-platform-engine:1.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=jmhRuntimeClasspath,testRuntimeClasspath org.junit:junit-bom:5.14.1=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.mockito:mockito-junit-jupiter:4.4.0=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=jmhRuntimeClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy deleted file mode 100644 index bbe25f09425..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/integration/IntegrationPeriodicActionTest.groovy +++ /dev/null @@ -1,30 +0,0 @@ -package datadog.telemetry.integration - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Integration -import datadog.trace.api.telemetry.IntegrationsCollector -import spock.lang.Specification - -class IntegrationPeriodicActionTest extends Specification { - IntegrationPeriodicAction periodicAction = new IntegrationPeriodicAction() - TelemetryService telemetryService = Mock() - - void 'push integrations into the telemetry service'() { - setup: - IntegrationsCollector.get().update(['web', 'jdbc'], true) - - when: - periodicAction.doIteration(telemetryService) - - then: - 1 * telemetryService.addIntegration( { Integration integration -> - integration.name == 'web' && - integration.enabled - } ) - 1 * telemetryService.addIntegration( { Integration integration -> - integration.name == 'jdbc' && - integration.enabled - } ) - 0 * _ - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.groovy deleted file mode 100644 index 073c1e3e68f..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.groovy +++ /dev/null @@ -1,29 +0,0 @@ -package datadog.telemetry.metric - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Metric -import spock.lang.Specification - -class ConfigInversionMetricPeriodicActionTest extends Specification{ - - void 'test undocumented env var metric'() { - setup: - final telemetryService = Mock(TelemetryService) - final action = new ConfigInversionMetricPeriodicAction() - - when: - action.collector().setUndocumentedEnvVarMetric("DD_ENV_VAR") - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric({ Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'untracked.config.detected' && - metric.points[0][1] == 1 && - metric.tags == ['config_name:DD_ENV_VAR'] && - metric.type == Metric.TypeEnum.COUNT - }) - 0 * _._ - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/CoreMetricsPeriodActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/CoreMetricsPeriodActionTest.groovy deleted file mode 100644 index b4235810beb..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/CoreMetricsPeriodActionTest.groovy +++ /dev/null @@ -1,176 +0,0 @@ -package datadog.telemetry.metric - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Metric -import datadog.trace.api.metrics.SpanMetricRegistry -import datadog.trace.api.metrics.SpanMetrics -import spock.lang.Specification - -class CoreMetricsPeriodActionTest extends Specification { - - void 'test span metrics with multiple occurrence events'() { - given: - final telemetryService = Mock(TelemetryService) - final action = new CoreMetricsPeriodicAction() - final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance() - final SpanMetrics instr1SpanMetric = spanMetricRegistry.get('instr-1') - final SpanMetrics instr2SpanMetric = spanMetricRegistry.get('instr-2') - - when: - instr1SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanCreated() - instr1SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanFinished() - instr2SpanMetric.onSpanFinished() - instr2SpanMetric.onSpanFinished() - instr2SpanMetric.onSpanFinished() - - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-1', 2) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-2', 3) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-2', 4) - }) - 0 * _ - } - - void 'test span metrics with interleaved events'() { - given: - final telemetryService = Mock(TelemetryService) - final action = new CoreMetricsPeriodicAction() - final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance() - final SpanMetrics instr1SpanMetric = spanMetricRegistry.get('instr-1') - final SpanMetrics instr2SpanMetric = spanMetricRegistry.get('instr-2') - final SpanMetrics instr3SpanMetric = spanMetricRegistry.get('instr-3') - final SpanMetrics instrASpanMetric = spanMetricRegistry.get('instr-a') - final SpanMetrics instrBSpanMetric = spanMetricRegistry.get('instr-b') - - when: - instr1SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanCreated() - instr3SpanMetric.onSpanCreated() - instr3SpanMetric.onSpanFinished() - instrASpanMetric.onSpanCreated() - instrBSpanMetric.onSpanCreated() - instrBSpanMetric.onSpanFinished() - instr2SpanMetric.onSpanFinished() - instrASpanMetric.onSpanFinished() - instr1SpanMetric.onSpanFinished() - - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-1', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-2', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-3', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-3', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-a', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-b', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-b', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-2', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-a', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-1', 1) - }) - 0 * _ - } - - void 'test span metrics'() { - given: - final telemetryService = Mock(TelemetryService) - final action = new CoreMetricsPeriodicAction() - final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance() - final SpanMetrics instr1SpanMetric = spanMetricRegistry.get('instr-1') - final SpanMetrics instr2SpanMetric = spanMetricRegistry.get('instr-2') - final SpanMetrics instr3SpanMetric = spanMetricRegistry.get('instr-3') - final SpanMetrics instrASpanMetric = spanMetricRegistry.get('instr-a') - final SpanMetrics instrBSpanMetric = spanMetricRegistry.get('instr-b') - - when: - instr1SpanMetric.onSpanCreated() - instr2SpanMetric.onSpanCreated() - instr3SpanMetric.onSpanCreated() - instr3SpanMetric.onSpanFinished() - instrASpanMetric.onSpanCreated() - instrBSpanMetric.onSpanCreated() - instrBSpanMetric.onSpanFinished() - instr2SpanMetric.onSpanFinished() - instrASpanMetric.onSpanFinished() - instr1SpanMetric.onSpanFinished() - - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-1', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-2', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-3', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-3', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-a', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_created', 'instr-b', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-b', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-2', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-a', 1) - }) - 1 * telemetryService.addMetric({ Metric metric -> - assertMetric(metric, 'spans_finished', 'instr-1', 1) - }) - 0 * _ - } - - void assertMetric(Metric metric, String metricName, String instrumentationName, long count) { - assert metric.namespace == 'tracers' - assert metric.common - assert metric.metric == metricName - assert metric.points.size() == 1 - assert metric.points[0].size() == 2 - assert metric.points[0][1] == count - assert metric.tags == ['integration_name:' + instrumentationName] - assert metric.type == Metric.TypeEnum.COUNT - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/IastMetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/IastMetricPeriodicActionTest.groovy deleted file mode 100644 index d4808d4aaae..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/IastMetricPeriodicActionTest.groovy +++ /dev/null @@ -1,86 +0,0 @@ -package datadog.telemetry.metric - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Metric -import datadog.trace.api.iast.SourceTypes -import datadog.trace.api.iast.telemetry.IastMetric -import datadog.trace.api.iast.telemetry.IastMetricCollector -import groovy.transform.CompileDynamic -import spock.lang.Shared -import spock.lang.Specification - -@CompileDynamic -class IastMetricPeriodicActionTest extends Specification { - - @Shared - protected static final IastMetricCollector ORIGINAL_COLLECTOR = IastMetricCollector.INSTANCE - - void setup() { - IastMetricCollector.register(new IastMetricCollector()) - } - - void cleanup() { - IastMetricCollector.register(ORIGINAL_COLLECTOR) - } - - void 'test metric'() { - given: - final action = new IastMetricPeriodicAction() - final service = Mock(TelemetryService) - final iastMetric = IastMetric.EXECUTED_TAINTED - final value = 23 - - when: - IastMetricCollector.add(iastMetric, value) - IastMetricCollector.get().prepareMetrics() - action.doIteration(service) - - then: - 1 * service.addMetric({ matches(it, iastMetric, value, []) }) - 0 * _ - } - - void 'test tagged metric'() { - given: - final action = new IastMetricPeriodicAction() - final service = Mock(TelemetryService) - final iastMetric = IastMetric.INSTRUMENTED_SOURCE - final tag = SourceTypes.REQUEST_PARAMETER_VALUE - final tagString = SourceTypes.toString(tag) - final value = 23 - - when: - IastMetricCollector.add(iastMetric, tag, value) - IastMetricCollector.get().prepareMetrics() - action.doIteration(service) - - then: - 1 * service.addMetric({ matches(it, iastMetric, value, ["${iastMetric.tag.name}:${tagString}"]) }) - 0 * _ - } - - void 'test with no metrics'() { - given: - final action = new IastMetricPeriodicAction() - final service = Mock(TelemetryService) - - when: - action.doIteration(service) - - then: - 0 * _ - } - - private static boolean matches(final Metric metric, final IastMetric iastMetric, final long value, final List tags) { - if (metric.namespace != 'iast') { - return false - } - if (metric.metric != iastMetric.name) { - return false - } - if (metric.tags != tags) { - return false - } - return metric.points.first()[1] == value - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy deleted file mode 100644 index 649260c38d9..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/MetricPeriodicActionTest.groovy +++ /dev/null @@ -1,172 +0,0 @@ -package datadog.telemetry.metric - - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.DistributionSeries -import datadog.telemetry.api.Metric -import datadog.trace.api.telemetry.MetricCollector -import groovy.transform.NamedDelegate -import groovy.transform.NamedVariant -import javax.annotation.Nonnull -import spock.lang.Specification - -class MetricPeriodicActionTest extends Specification { - - void 'test that common metrics are joined before being sent to telemetry #iterationIndex'() { - given: - final service = Mock(TelemetryService) - final MetricCollector metricCollector = Mock(MetricCollector) - final action = new DefaultMetricPeriodicAction(metricCollector) - - when: - action.doIteration(service) - - then: - metricCollector.drainDistributionSeries() >> [] - metricCollector.drain() >> metrics - expected.each { Metric metric -> - 1 * service.addMetric({ it -> - assertMetric(it, metric) - }) - } - 0 * _ - - where: - metrics | expected - [col(counter: 2L)] | [tel(points: [[_, 2L]])] - [col(counter: 2L), col(counter: 6L)] | [tel(points: [[_, 2L], [_, 6L]])] - [col(counter: 2L), col(namespace: 'other', counter: 6L)] | [tel(points: [[_, 2L]]), tel(namespace: 'other', points: [[_, 6L]])] - [col(counter: 2L), col(common: false, counter: 6L)] | [tel(points: [[_, 2L]]), tel(common: false, points: [[_, 6L]])] - [col(counter: 2L), col(metric: 'other', counter: 6L)] | [tel(points: [[_, 2L]]), tel(metric: 'other', points: [[_, 6L]])] - [col(counter: 2L), col(tags: ['a:b'], counter: 6L)] | [tel(points: [[_, 2L]]), tel(tags: ['a:b'], points: [[_, 6L]])] - [col(counter: 2L, tags: ['a:b']), col(counter: 6L, tags: ['c:d'])] | [tel(points: [[_, 2L]], tags: ['a:b']), tel(points: [[_, 6L]], tags: ['c:d'])] - [col(counter: 2L, tags: ['a:b', 'c:d']), col(counter: 6L, tags: ['a:b', 'c:d'])] | [tel(points: [[_, 2L], [_, 6L]], tags: ['a:b', 'c:d'])] - } - - void 'test that common distribution series are joined before being sent to telemetry #iterationIndex'() { - given: - final service = Mock(TelemetryService) - final MetricCollector metricCollector = Mock(MetricCollector) - final action = new DefaultMetricPeriodicAction(metricCollector) - - when: - action.doIteration(service) - - then: - metricCollector.drain() >> [] - metricCollector.drainDistributionSeries() >> distributionSeries - expected.each { DistributionSeries series -> - 1 * service.addDistributionSeries({ it -> - assertDistributionSeries(it, series) - }) - } - 0 * _ - - where: - distributionSeries | expected - [rawSeries(value: 2)] | [series(points: [2])] - [rawSeries(value: 2), rawSeries(value: 6)] | [series(points: [2, 6])] - [rawSeries(value: 2), rawSeries(namespace: 'other', value: 6)] | [series(points: [2]), series(namespace: 'other', points: [6])] - [rawSeries(value: 2), rawSeries(common: false, value: 6)] | [series(points: [2]), series(common: false, points: [6])] - [rawSeries(value: 2), rawSeries(metric: 'other', value: 6)] | [series(points: [2]), series(metric: 'other', points: [6])] - [rawSeries(value: 2), rawSeries(tags: ['a:b'], value: 6)] | [series(points: [2]), series(tags: ['a:b'], points: [6])] - [rawSeries(value: 2, tags: ['a:b']), rawSeries(value: 6, tags: ['c:d'])] | [series(points: [2], tags: ['a:b']), series(points: [6], tags: ['c:d'])] - [rawSeries(value: 2, tags: ['a:b', 'c:d']), rawSeries(value: 6, tags: ['a:b', 'c:d'])] | [series(points: [2, 6], tags: ['a:b', 'c:d'])] - } - - private static MetricCollector.Metric col(final Map metric) { - metric.namespace = metric.namespace ?: 'namespace' - metric.metric = metric.metric ?: 'metric' - metric.common = metric.common == null ? true : metric.common - metric.tags = metric.tags ?: [] - return new MetricCollector.Metric( - metric.namespace as String, - metric.common as boolean, - metric.metric as String, - 'count', - metric.counter as Long, - metric.tags as String[] - ) - } - - @NamedVariant - private static Metric tel(@NamedDelegate final Metric metric) { - metric.namespace = metric.namespace ?: 'namespace' - metric.metric = metric.metric ?: 'metric' - metric.common = metric.common == null ? true : metric.common - metric.tags = metric.tags ?: [] - metric.type = metric.type ?: Metric.TypeEnum.COUNT - return metric - } - - private static MetricCollector.DistributionSeriesPoint rawSeries(final Map point) { - point.namespace = point.namespace ?: 'namespace' - point.metric = point.metric ?: 'metric' - point.common = point.common == null ? true : point.common - point.tags = point.tags ?: [] - return new MetricCollector.DistributionSeriesPoint( - point.metric as String, - point.common as boolean, - point.namespace as String, - point.value as Integer, - point.tags as List - ) - } - - private static DistributionSeries series(final Map distributionSeries) { - return new DistributionSeries() - .namespace(distributionSeries.namespace as String ?: 'namespace') - .metric(distributionSeries.metric as String ?: 'metric') - .common(distributionSeries.common == null ? true : distributionSeries.common as Boolean) - .tags(distributionSeries.tags as List ?: []) - .points(distributionSeries.points as List) - } - - private static boolean assertMetric(Metric received, Metric expected) { - if (!Objects.equals(received.namespace, expected.namespace)) { - return false - } - if (!Objects.equals(received.metric, expected.metric)) { - return false - } - if (!Objects.equals(received.common, expected.common)) { - return false - } - if (!Objects.equals(received.type, expected.type)) { - return false - } - if (!Objects.equals(received.tags, expected.tags)) { - return false - } - if (received.points.size() != expected.points.size()) { - return false - } - final expectedPoints = expected.points.collect { it[1] } - final receivedPoints = received.points.collect { it[1] } - return receivedPoints.containsAll(expectedPoints) - } - - private static boolean assertDistributionSeries(DistributionSeries received, DistributionSeries expected) { - return Objects.equals(received.namespace, expected.namespace) && - Objects.equals(received.metric, expected.metric) && - Objects.equals(received.common, expected.common) && - Objects.equals(received.tags, expected.tags) && - received.points.size() == expected.points.size() && - received.points.containsAll(expected.points) - } - - class DefaultMetricPeriodicAction extends MetricPeriodicAction { - - private final MetricCollector collector - - DefaultMetricPeriodicAction(@Nonnull final MetricCollector collector) { - this.collector = collector - } - - @Override - @Nonnull - MetricCollector collector() { - return collector - } - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.groovy deleted file mode 100644 index 7f915625be2..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.groovy +++ /dev/null @@ -1,118 +0,0 @@ -package datadog.telemetry.metric - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Metric -import spock.lang.Specification - -class OtelEnvMetricPeriodicActionTest extends Specification{ - - void 'test otel env var hiding metric'() { - setup: - final telemetryService = Mock(TelemetryService) - final action = new OtelEnvMetricPeriodicAction() - - when: - action.collector().setHidingOtelEnvVarMetric("otel_service_name","dd_service_name") - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.hiding' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:otel_service_name', 'config_datadog:dd_service_name'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 0 * _._ - } - - void 'test otel env var unsupported metric'() { - setup: - - final telemetryService = Mock(TelemetryService) - final action = new OtelEnvMetricPeriodicAction() - - when: - action.collector().setUnsupportedOtelEnvVarMetric("unsupported_env_var") - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.unsupported' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:unsupported_env_var'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 0 * _._ - } - - void 'test otel env var invalid metric'() { - setup: - final telemetryService = Mock(TelemetryService) - final action = new OtelEnvMetricPeriodicAction() - - when: - action.collector().setInvalidOtelEnvVarMetric("otel_env_var","dd_env_var") - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.invalid' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:otel_env_var', 'config_datadog:dd_env_var'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 0 * _._ - } - - void 'test Otel env var multiple metrics'() { - setup: - final telemetryService = Mock(TelemetryService) - final action = new OtelEnvMetricPeriodicAction() - - when: - action.collector().setInvalidOtelEnvVarMetric("otel_env_var","dd_env_var") - action.collector().setInvalidOtelEnvVarMetric("otel_env_var2","dd_env_var2") - action.collector().setHidingOtelEnvVarMetric("otel_service_name","dd_service_name") - action.collector().setUnsupportedOtelEnvVarMetric("unsupported_env_var") - action.collector().prepareMetrics() - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.invalid' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:otel_env_var', 'config_datadog:dd_env_var'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.invalid' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:otel_env_var2', 'config_datadog:dd_env_var2'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.hiding' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:otel_service_name', 'config_datadog:dd_service_name'] && - metric.type == Metric.TypeEnum.COUNT - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'tracers' && - metric.metric == 'otel.env.unsupported' && - metric.points[0][1] == 1 && - metric.tags == ['config_opentelemetry:unsupported_env_var'] && - metric.type == Metric.TypeEnum.COUNT - } ) - - 0 * _._ - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy b/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy deleted file mode 100644 index 9486fc432aa..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/metric/WafMetricPeriodicActionSpecification.groovy +++ /dev/null @@ -1,358 +0,0 @@ -package datadog.telemetry.metric - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.Metric -import datadog.trace.api.telemetry.WafMetricCollector -import datadog.trace.test.util.DDSpecification - -class WafMetricPeriodicActionSpecification extends DDSpecification { - WafMetricPeriodicAction periodicAction = new WafMetricPeriodicAction() - TelemetryService telemetryService = Mock() - - void 'push waf metrics into the telemetry service'() { - setup: - WafMetricCollector.get().wafInit('0.0.0', 'rules_ver_1', true) - WafMetricCollector.get().wafUpdates('rules_ver_2', true) - WafMetricCollector.get().wafUpdates('rules_ver_3', true) - - when: - periodicAction.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.init' && - metric.points[0][1] == 1 && - metric.tags == ['waf_version:0.0.0', 'event_rules_version:rules_ver_1', 'success:true'] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.updates' && - metric.points[0][1] == 1 && - metric.tags == ['waf_version:0.0.0', 'event_rules_version:rules_ver_2', 'success:true'] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.updates' && - metric.points[0][1] == 1 && - metric.tags == ['waf_version:0.0.0', 'event_rules_version:rules_ver_3', 'success:true'] - } ) - 0 * _._ - } - - 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, 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) - - then: - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.init' - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 3 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:true', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:true', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:true', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:true', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:true', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:true', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_1', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - '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, 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) - - then: 'following waf.request have a new event_rules_version tag' - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.updates' - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:true', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:true', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:true', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:true', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:true', - 'rate_limited:false', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:true', - 'input_truncated:false', - 'request_excluded:none', - ] - } ) - 1 * telemetryService.addMetric( { Metric metric -> - metric.namespace == 'appsec' && - metric.metric == 'waf.requests' && - metric.points[0][1] == 1 && - metric.tags == [ - 'waf_version:0.0.0', - 'event_rules_version:rules_ver_2', - 'rule_triggered:false', - 'request_blocked:false', - 'waf_error:false', - 'waf_timeout:false', - 'block_failure:false', - 'rate_limited:false', - 'input_truncated:true', - 'request_excluded:none', - ] - } ) - 0 * _._ - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/products/ProductChangeActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/products/ProductChangeActionTest.groovy deleted file mode 100644 index 9a9eec82320..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/products/ProductChangeActionTest.groovy +++ /dev/null @@ -1,28 +0,0 @@ -package datadog.telemetry.products - -import datadog.telemetry.TelemetryService -import datadog.trace.api.telemetry.ProductChange -import datadog.trace.api.telemetry.ProductChangeCollector -import spock.lang.Specification - -import static datadog.trace.api.telemetry.ProductChange.ProductType.APPSEC - -class ProductChangeActionTest extends Specification { - ProductChangeAction action = new ProductChangeAction() - TelemetryService telemetryService = Mock() - - void 'push product changes into the telemetry service'() { - setup: - ProductChangeCollector.get().update(new ProductChange().productType(APPSEC).enabled(true )) - - when: - action.doIteration(telemetryService) - - then: - 1 * telemetryService.addProductChange( { ProductChange product -> - product.getProductType() == APPSEC && - product.isEnabled() - } ) - 0 * _ - } -} diff --git a/telemetry/src/test/groovy/datadog/telemetry/rum/RumPeriodicActionTest.groovy b/telemetry/src/test/groovy/datadog/telemetry/rum/RumPeriodicActionTest.groovy deleted file mode 100644 index 08b06a7d064..00000000000 --- a/telemetry/src/test/groovy/datadog/telemetry/rum/RumPeriodicActionTest.groovy +++ /dev/null @@ -1,58 +0,0 @@ -package datadog.telemetry.rum - -import datadog.telemetry.TelemetryService -import datadog.telemetry.api.DistributionSeries -import datadog.telemetry.api.Metric -import datadog.trace.api.rum.RumInjectorMetrics -import datadog.trace.api.rum.RumTelemetryCollector -import spock.lang.Specification - -class RumPeriodicActionTest extends Specification { - TelemetryService telemetryService = Mock() - - void 'push RUM metrics into the telemetry service'() { - setup: - def metricsCollector = new RumInjectorMetrics() - metricsCollector.onInjectionSucceed("3") - metricsCollector.onInjectionFailed("5", "gzip") - metricsCollector.onInjectionResponseSize("3", 1024) - - def periodicAction = new RumPeriodicAction(metricsCollector) - - when: - periodicAction.doIteration(telemetryService) - - then: - 1 * telemetryService.addMetric({ Metric metric -> - metric.namespace == "rum" && - metric.metric == "injection.succeed" && - metric.type == Metric.TypeEnum.COUNT - }) - - 1 * telemetryService.addMetric({ Metric metric -> - metric.namespace == "rum" && - metric.metric == "injection.failed" && - metric.type == Metric.TypeEnum.COUNT - }) - - 1 * telemetryService.addDistributionSeries({ DistributionSeries dist -> - dist.namespace == "rum" && - dist.metric == "injection.response.bytes" - }) - - 0 * _ - } - - void 'push nothing when no metrics collector is set'() { - setup: - def periodicAction = new RumPeriodicAction(RumTelemetryCollector.NO_OP) - - when: - periodicAction.doIteration(telemetryService) - - then: - 0 * telemetryService.addMetric(_) - 0 * telemetryService.addDistributionSeries(_) - 0 * _ - } -} diff --git a/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java new file mode 100644 index 00000000000..91fc3fe4904 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/integration/IntegrationPeriodicActionTest.java @@ -0,0 +1,48 @@ +package datadog.telemetry.integration; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Integration; +import datadog.trace.api.telemetry.IntegrationsCollector; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class IntegrationPeriodicActionTest { + + private final IntegrationPeriodicAction periodicAction = new IntegrationPeriodicAction(); + private final TelemetryService telemetryService = mock(TelemetryService.class); + + @Test + void pushIntegrationsIntoTheTelemetryService() { + IntegrationsCollector.get().update(Arrays.asList("web", "jdbc"), true); + + periodicAction.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Integration.class); + verify(telemetryService, times(2)).addIntegration(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + List integrations = captor.getAllValues(); + assertMatchingIntegration(integrations, "web"); + assertMatchingIntegration(integrations, "jdbc"); + } + + private void assertMatchingIntegration(List integrations, String name) { + List matches = + integrations.stream() + .filter(integration -> integration.name.equals(name)) + .collect(Collectors.toList()); + assertEquals(1, matches.size(), "expected exactly one match for " + name); + assertTrue(matches.get(0).enabled); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java new file mode 100644 index 00000000000..56a2ec80d52 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/ConfigInversionMetricPeriodicActionTest.java @@ -0,0 +1,42 @@ +package datadog.telemetry.metric; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Metric; +import datadog.trace.api.telemetry.ConfigInversionMetricCollectorImpl; +import java.util.Arrays; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class ConfigInversionMetricPeriodicActionTest { + + private final TelemetryService telemetryService = mock(TelemetryService.class); + private final ConfigInversionMetricPeriodicAction action = + new ConfigInversionMetricPeriodicAction(); + private final ConfigInversionMetricCollectorImpl collector = + ConfigInversionMetricCollectorImpl.getInstance(); + + @Test + void testUndocumentedEnvVarMetric() { + collector.setUndocumentedEnvVarMetric("DD_ENV_VAR"); + collector.prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(1)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + Metric metric = captor.getValue(); + assertEquals("tracers", metric.getNamespace()); + assertEquals("untracked.config.detected", metric.getMetric()); + assertEquals(1L, metric.getPoints().get(0).get(1).longValue()); + assertEquals(Arrays.asList("config_name:DD_ENV_VAR"), metric.getTags()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java new file mode 100644 index 00000000000..fff8fc144c7 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/CoreMetricsPeriodicActionTest.java @@ -0,0 +1,156 @@ +package datadog.telemetry.metric; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Metric; +import datadog.trace.api.metrics.SpanMetricRegistry; +import datadog.trace.api.metrics.SpanMetrics; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class CoreMetricsPeriodicActionTest { + + private final TelemetryService telemetryService = mock(TelemetryService.class); + private final CoreMetricsPeriodicAction action = new CoreMetricsPeriodicAction(); + private final SpanMetricRegistry spanMetricRegistry = SpanMetricRegistry.getInstance(); + + @Test + void testSpanMetricsWithMultipleOccurrenceEvents() { + SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1"); + SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2"); + + instr1SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanCreated(); + instr1SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanFinished(); + instr2SpanMetric.onSpanFinished(); + instr2SpanMetric.onSpanFinished(); + instr2SpanMetric.onSpanFinished(); + + action.collector().prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(3)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + List metrics = captor.getAllValues(); + assertMetric(metrics, "spans_created", "instr-1", 2); + assertMetric(metrics, "spans_created", "instr-2", 3); + assertMetric(metrics, "spans_finished", "instr-2", 4); + } + + @Test + void testSpanMetricsWithInterleavedEvents() { + SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1"); + SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2"); + SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3"); + SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a"); + SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b"); + + instr1SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanCreated(); + instr3SpanMetric.onSpanCreated(); + instr3SpanMetric.onSpanFinished(); + instrASpanMetric.onSpanCreated(); + instrBSpanMetric.onSpanCreated(); + instrBSpanMetric.onSpanFinished(); + instr2SpanMetric.onSpanFinished(); + instrASpanMetric.onSpanFinished(); + instr1SpanMetric.onSpanFinished(); + + action.collector().prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(10)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + List metrics = captor.getAllValues(); + assertMetric(metrics, "spans_created", "instr-1", 1); + assertMetric(metrics, "spans_created", "instr-2", 1); + assertMetric(metrics, "spans_created", "instr-3", 1); + assertMetric(metrics, "spans_finished", "instr-3", 1); + assertMetric(metrics, "spans_created", "instr-a", 1); + assertMetric(metrics, "spans_created", "instr-b", 1); + assertMetric(metrics, "spans_finished", "instr-b", 1); + assertMetric(metrics, "spans_finished", "instr-2", 1); + assertMetric(metrics, "spans_finished", "instr-a", 1); + assertMetric(metrics, "spans_finished", "instr-1", 1); + } + + @Test + void testSpanMetrics() { + SpanMetrics instr1SpanMetric = spanMetricRegistry.get("instr-1"); + SpanMetrics instr2SpanMetric = spanMetricRegistry.get("instr-2"); + SpanMetrics instr3SpanMetric = spanMetricRegistry.get("instr-3"); + SpanMetrics instrASpanMetric = spanMetricRegistry.get("instr-a"); + SpanMetrics instrBSpanMetric = spanMetricRegistry.get("instr-b"); + + instr1SpanMetric.onSpanCreated(); + instr2SpanMetric.onSpanCreated(); + instr3SpanMetric.onSpanCreated(); + instr3SpanMetric.onSpanFinished(); + instrASpanMetric.onSpanCreated(); + instrBSpanMetric.onSpanCreated(); + instrBSpanMetric.onSpanFinished(); + instr2SpanMetric.onSpanFinished(); + instrASpanMetric.onSpanFinished(); + instr1SpanMetric.onSpanFinished(); + + action.collector().prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(10)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + List metrics = captor.getAllValues(); + assertMetric(metrics, "spans_created", "instr-1", 1); + assertMetric(metrics, "spans_created", "instr-2", 1); + assertMetric(metrics, "spans_created", "instr-3", 1); + assertMetric(metrics, "spans_finished", "instr-3", 1); + assertMetric(metrics, "spans_created", "instr-a", 1); + assertMetric(metrics, "spans_created", "instr-b", 1); + assertMetric(metrics, "spans_finished", "instr-b", 1); + assertMetric(metrics, "spans_finished", "instr-2", 1); + assertMetric(metrics, "spans_finished", "instr-a", 1); + assertMetric(metrics, "spans_finished", "instr-1", 1); + } + + /** + * MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not + * guaranteed; match each expected metric by its metric name and instrumentation tag rather than + * by capture position. + */ + private void assertMetric( + List metrics, String metricName, String instrumentationName, long count) { + List expectedTags = Arrays.asList("integration_name:" + instrumentationName); + List matches = + metrics.stream() + .filter(metric -> metric.getMetric().equals(metricName)) + .filter(metric -> expectedTags.equals(metric.getTags())) + .collect(Collectors.toList()); + assertEquals( + 1, matches.size(), "expected exactly one match for " + metricName + " " + expectedTags); + + Metric metric = matches.get(0); + assertEquals("tracers", metric.getNamespace()); + assertEquals(true, metric.getCommon()); + assertEquals(1, metric.getPoints().size()); + assertEquals(2, metric.getPoints().get(0).size()); + assertEquals(count, metric.getPoints().get(0).get(1).longValue()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java new file mode 100644 index 00000000000..2189035dd78 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/IastMetricPeriodicActionTest.java @@ -0,0 +1,91 @@ +package datadog.telemetry.metric; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Metric; +import datadog.trace.api.iast.SourceTypes; +import datadog.trace.api.iast.telemetry.IastMetric; +import datadog.trace.api.iast.telemetry.IastMetricCollector; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class IastMetricPeriodicActionTest { + + private static final IastMetricCollector ORIGINAL_COLLECTOR = IastMetricCollector.get(); + + private final IastMetricPeriodicAction action = new IastMetricPeriodicAction(); + private final TelemetryService telemetryService = mock(TelemetryService.class); + + @BeforeEach + void setUp() { + IastMetricCollector.register(new IastMetricCollector()); + } + + @AfterEach + void tearDown() { + IastMetricCollector.register(ORIGINAL_COLLECTOR); + } + + @Test + void testMetric() { + IastMetric iastMetric = IastMetric.EXECUTED_TAINTED; + int value = 23; + + IastMetricCollector.add(iastMetric, value); + IastMetricCollector.get().prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(1)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + assertMetric(captor.getValue(), iastMetric, value, Collections.emptyList()); + } + + @Test + void testTaggedMetric() { + IastMetric iastMetric = IastMetric.INSTRUMENTED_SOURCE; + byte tag = SourceTypes.REQUEST_PARAMETER_VALUE; + String tagString = SourceTypes.toString(tag); + int value = 23; + + IastMetricCollector.add(iastMetric, tag, value); + IastMetricCollector.get().prepareMetrics(); + action.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(1)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + assertMetric( + captor.getValue(), + iastMetric, + value, + Arrays.asList(iastMetric.getTag().getName() + ":" + tagString)); + } + + @Test + void testWithNoMetrics() { + action.doIteration(telemetryService); + + verifyNoMoreInteractions(telemetryService); + } + + private void assertMetric(Metric metric, IastMetric iastMetric, long value, List tags) { + assertEquals("iast", metric.getNamespace()); + assertEquals(iastMetric.getName(), metric.getMetric()); + assertEquals(tags, metric.getTags()); + assertEquals(value, metric.getPoints().get(0).get(1).longValue()); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java new file mode 100644 index 00000000000..bd90a582f65 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/MetricPeriodicActionTest.java @@ -0,0 +1,321 @@ +package datadog.telemetry.metric; + +import static java.util.Collections.emptyList; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +import static org.mockito.Mockito.ignoreStubs; +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.telemetry.TelemetryService; +import datadog.telemetry.api.DistributionSeries; +import datadog.telemetry.api.Metric; +import datadog.trace.api.telemetry.MetricCollector; +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import javax.annotation.Nonnull; +import org.mockito.ArgumentCaptor; +import org.tabletest.junit.TableTest; +import org.tabletest.junit.TypeConverter; + +public class MetricPeriodicActionTest { + + private ArgumentCaptor metricCaptor = forClass(Metric.class); + private ArgumentCaptor distributionSeriesCaptor = + forClass(DistributionSeries.class); + + @TableTest({ + "scenario | metrics | expected ", + "single raw metric produces a single telemetry point | ['col(counter: 2)'] | ['tel(points: [2])'] ", + "two raw metrics with the same identity are joined | ['col(counter: 2)', 'col(counter: 6)'] | ['tel(points: [2, 6])'] ", + "different namespace produces a distinct telemetry metric | ['col(counter: 2)', 'col(namespace: \"other\", counter: 6)'] | ['tel(points: [2])', 'tel(namespace: \"other\", points: [6])'] ", + "different common flag produces a distinct telemetry metric | ['col(counter: 2)', 'col(common: false, counter: 6)'] | ['tel(points: [2])', 'tel(common: false, points: [6])'] ", + "different metric name produces a distinct telemetry metric | ['col(counter: 2)', 'col(metric: \"other\", counter: 6)'] | ['tel(points: [2])', 'tel(metric: \"other\", points: [6])'] ", + "different tags produce a distinct telemetry metric | ['col(counter: 2)', 'col(tags: [a:b], counter: 6)'] | ['tel(points: [2])', 'tel(tags: [a:b], points: [6])'] ", + "distinct tags on both raw metrics stay distinct | ['col(counter: 2, tags: [a:b])', 'col(counter: 6, tags: [c:d])'] | ['tel(points: [2], tags: [a:b])', 'tel(points: [6], tags: [c:d])']", + "same tags on both raw metrics are joined | ['col(counter: 2, tags: [a:b, c:d])', 'col(counter: 6, tags: [a:b, c:d])'] | ['tel(points: [2, 6], tags: [a:b, c:d])'] " + }) + void testCommonMetricsAreJoinedBeforeBeingSentToTelemetry( + List metrics, List expected) { + TelemetryService telemetryService = mock(TelemetryService.class); + MetricCollector metricCollector = mock(MetricCollector.class); + when(metricCollector.drain()).thenReturn(metrics); + when(metricCollector.drainDistributionSeries()).thenReturn(emptyList()); + DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector); + + action.doIteration(telemetryService); + + verify(telemetryService, times(expected.size())).addMetric(metricCaptor.capture()); + verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector)); + + List actualMetrics = metricCaptor.getAllValues(); + for (ExpectedMetric expectedMetric : expected) { + assertMatchingMetric(actualMetrics, expectedMetric); + } + } + + @TableTest({ + "scenario | distributionSeries | expected ", + "single raw series point produces a single telemetry series | ['rawSeries(value: 2)'] | ['series(points: [2])'] ", + "two raw series points with the same identity are joined | ['rawSeries(value: 2)', 'rawSeries(value: 6)'] | ['series(points: [2, 6])'] ", + "different namespace produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(namespace: \"other\", value: 6)'] | ['series(points: [2])', 'series(namespace: \"other\", points: [6])'] ", + "different common flag produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(common: false, value: 6)'] | ['series(points: [2])', 'series(common: false, points: [6])'] ", + "different metric name produces a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(metric: \"other\", value: 6)'] | ['series(points: [2])', 'series(metric: \"other\", points: [6])'] ", + "different tags produce a distinct telemetry series | ['rawSeries(value: 2)', 'rawSeries(tags: [a:b], value: 6)'] | ['series(points: [2])', 'series(tags: [a:b], points: [6])'] ", + "distinct tags on both raw series points stay distinct | ['rawSeries(value: 2, tags: [a:b])', 'rawSeries(value: 6, tags: [c:d])'] | ['series(points: [2], tags: [a:b])', 'series(points: [6], tags: [c:d])']", + "same tags on both raw series points are joined | ['rawSeries(value: 2, tags: [a:b, c:d])', 'rawSeries(value: 6, tags: [a:b, c:d])'] | ['series(points: [2, 6], tags: [a:b, c:d])'] " + }) + void testCommonDistributionSeriesAreJoinedBeforeBeingSentToTelemetry( + List distributionSeries, + List expected) { + TelemetryService telemetryService = mock(TelemetryService.class); + MetricCollector metricCollector = mock(MetricCollector.class); + when(metricCollector.drain()).thenReturn(emptyList()); + when(metricCollector.drainDistributionSeries()).thenReturn(distributionSeries); + DefaultMetricPeriodicAction action = new DefaultMetricPeriodicAction(metricCollector); + + action.doIteration(telemetryService); + + verify(telemetryService, times(expected.size())) + .addDistributionSeries(distributionSeriesCaptor.capture()); + verifyNoMoreInteractions(ignoreStubs(telemetryService, metricCollector)); + + List actualSeries = distributionSeriesCaptor.getAllValues(); + for (ExpectedSeries expectedSeries : expected) { + assertMatchingSeries(actualSeries, expectedSeries); + } + } + + /** Parses a {@code col(key: value, ...)} cell into the raw metric it describes. */ + @TypeConverter + public static MetricCollector.Metric col(String token) { + Map args = parseArgs(token); + String namespace = stringArg(args, "namespace", "namespace"); + String metricName = stringArg(args, "metric", "metric"); + boolean common = booleanArg(args, "common", true); + List tags = tagsArg(args); + long counter = Long.parseLong(args.get("counter")); + return new MetricCollector.Metric(namespace, common, metricName, "count", counter, tags); + } + + /** Parses a {@code tel(key: value, ...)} cell into the expected telemetry metric. */ + @TypeConverter + public static ExpectedMetric tel(String token) { + Map args = parseArgs(token); + String namespace = stringArg(args, "namespace", "namespace"); + String metricName = stringArg(args, "metric", "metric"); + boolean common = booleanArg(args, "common", true); + List tags = tagsArg(args); + List points = longListArg(args, "points"); + return new ExpectedMetric(namespace, metricName, common, tags, points); + } + + /** Parses a {@code rawSeries(key: value, ...)} cell into the raw distribution series point. */ + @TypeConverter + public static MetricCollector.DistributionSeriesPoint rawSeries(String token) { + Map args = parseArgs(token); + String namespace = stringArg(args, "namespace", "namespace"); + String metricName = stringArg(args, "metric", "metric"); + boolean common = booleanArg(args, "common", true); + List tags = tagsArg(args); + int value = Integer.parseInt(args.get("value")); + return new MetricCollector.DistributionSeriesPoint(metricName, common, namespace, value, tags); + } + + /** Parses a {@code series(key: value, ...)} cell into the expected telemetry series. */ + @TypeConverter + public static ExpectedSeries series(String token) { + Map args = parseArgs(token); + String namespace = stringArg(args, "namespace", "namespace"); + String metricName = stringArg(args, "metric", "metric"); + boolean common = booleanArg(args, "common", true); + List tags = tagsArg(args); + List points = intListArg(args, "points"); + return new ExpectedSeries(namespace, metricName, common, tags, points); + } + + /** + * Splits the {@code (key: value, ...)} argument list of a builder cell such as {@code col(...)} + * into a name-to-raw-value map, honouring nested {@code [...]} tag/point lists. + */ + private static Map parseArgs(String token) { + String content = token.substring(token.indexOf('(') + 1, token.lastIndexOf(')')).trim(); + Map args = new LinkedHashMap<>(); + if (content.isEmpty()) { + return args; + } + int depth = 0; + int start = 0; + for (int i = 0; i <= content.length(); i++) { + char c = i == content.length() ? ',' : content.charAt(i); + if (c == '[') { + depth++; + } else if (c == ']') { + depth--; + } else if (c == ',' && depth == 0) { + String pair = content.substring(start, i).trim(); + int colon = pair.indexOf(':'); + args.put(pair.substring(0, colon).trim(), pair.substring(colon + 1).trim()); + start = i + 1; + } + } + return args; + } + + private static String stringArg(Map args, String key, String defaultValue) { + String raw = args.get(key); + return raw == null ? defaultValue : unquote(raw); + } + + private static String unquote(String value) { + return value.charAt(0) == '"' ? value.substring(1, value.length() - 1) : value; + } + + private static boolean booleanArg(Map args, String key, boolean defaultValue) { + String raw = args.get(key); + return raw == null ? defaultValue : Boolean.parseBoolean(raw); + } + + private static List tagsArg(Map args) { + String raw = args.get("tags"); + return raw == null ? emptyList() : splitBracketedList(raw); + } + + private static List splitBracketedList(String raw) { + String inner = raw.substring(raw.indexOf('[') + 1, raw.lastIndexOf(']')).trim(); + if (inner.isEmpty()) { + return emptyList(); + } + List values = new ArrayList<>(); + for (String part : inner.split(",")) { + values.add(part.trim()); + } + return values; + } + + private static List longListArg(Map args, String key) { + List values = new ArrayList<>(); + for (String value : splitBracketedList(args.get(key))) { + values.add(Long.parseLong(value)); + } + return values; + } + + private static List intListArg(Map args, String key) { + List values = new ArrayList<>(); + for (String value : splitBracketedList(args.get(key))) { + values.add(Integer.parseInt(value)); + } + return values; + } + + private static void assertMatchingMetric(List actualMetrics, ExpectedMetric expected) { + List matches = + actualMetrics.stream() + .filter(metric -> metric.getNamespace().equals(expected.namespace)) + .filter(metric -> metric.getMetric().equals(expected.metricName)) + .filter(metric -> metric.getCommon().equals(expected.common)) + .filter(metric -> metric.getTags().equals(expected.tags)) + .collect(Collectors.toList()); + assertEquals( + 1, + matches.size(), + "expected exactly one match for " + + expected.namespace + + "/" + + expected.metricName + + " " + + expected.tags); + + Metric metric = matches.get(0); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + List actualPoints = + metric.getPoints().stream() + .map(point -> point.get(1).longValue()) + .collect(Collectors.toList()); + assertEquals(expected.points.size(), actualPoints.size()); + assertEquals(true, actualPoints.containsAll(expected.points)); + } + + private static void assertMatchingSeries( + List actualSeries, ExpectedSeries expected) { + List matches = + actualSeries.stream() + .filter(series -> series.getNamespace().equals(expected.namespace)) + .filter(series -> series.getMetric().equals(expected.metricName)) + .filter(series -> series.getCommon().equals(expected.common)) + .filter(series -> series.getTags().equals(expected.tags)) + .collect(Collectors.toList()); + assertEquals( + 1, + matches.size(), + "expected exactly one match for " + + expected.namespace + + "/" + + expected.metricName + + " " + + expected.tags); + + DistributionSeries series = matches.get(0); + assertEquals(expected.points.size(), series.getPoints().size()); + assertEquals(true, series.getPoints().containsAll(expected.points)); + } + + private static class ExpectedMetric { + private final String namespace; + private final String metricName; + private final boolean common; + private final List tags; + private final List points; + + ExpectedMetric( + String namespace, String metricName, boolean common, List tags, List points) { + this.namespace = namespace; + this.metricName = metricName; + this.common = common; + this.tags = tags; + this.points = points; + } + } + + private static class ExpectedSeries { + private final String namespace; + private final String metricName; + private final boolean common; + private final List tags; + private final List points; + + ExpectedSeries( + String namespace, + String metricName, + boolean common, + List tags, + List points) { + this.namespace = namespace; + this.metricName = metricName; + this.common = common; + this.tags = tags; + this.points = points; + } + } + + private static class DefaultMetricPeriodicAction extends MetricPeriodicAction { + private final MetricCollector collector; + + DefaultMetricPeriodicAction(@Nonnull MetricCollector collector) { + this.collector = collector; + } + + @Override + @Nonnull + public MetricCollector collector() { + return collector; + } + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java new file mode 100644 index 00000000000..dff54f9d7c6 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/OtelEnvMetricPeriodicActionTest.java @@ -0,0 +1,125 @@ +package datadog.telemetry.metric; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Metric; +import datadog.trace.api.telemetry.OtelEnvMetricCollectorImpl; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class OtelEnvMetricPeriodicActionTest { + + private final TelemetryService telemetryService = mock(TelemetryService.class); + private final OtelEnvMetricPeriodicAction action = new OtelEnvMetricPeriodicAction(); + private final OtelEnvMetricCollectorImpl collector = OtelEnvMetricCollectorImpl.getInstance(); + private ArgumentCaptor metricCaptor = forClass(Metric.class); + + @Test + void testOtelEnvVarHidingMetric() { + collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name"); + collector.prepareMetrics(); + action.doIteration(telemetryService); + + verify(telemetryService, times(1)).addMetric(metricCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + Metric metric = metricCaptor.getValue(); + assertEquals("tracers", metric.getNamespace()); + assertEquals("otel.env.hiding", metric.getMetric()); + assertEquals(1L, metric.getPoints().get(0).get(1).longValue()); + assertEquals( + Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name"), + metric.getTags()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } + + @Test + void testOtelEnvVarUnsupportedMetric() { + collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var"); + collector.prepareMetrics(); + action.doIteration(telemetryService); + + verify(telemetryService, times(1)).addMetric(metricCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + Metric metric = metricCaptor.getValue(); + assertEquals("tracers", metric.getNamespace()); + assertEquals("otel.env.unsupported", metric.getMetric()); + assertEquals(1L, metric.getPoints().get(0).get(1).longValue()); + assertEquals(Arrays.asList("config_opentelemetry:unsupported_env_var"), metric.getTags()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } + + @Test + void testOtelEnvVarInvalidMetric() { + collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var"); + collector.prepareMetrics(); + action.doIteration(telemetryService); + + verify(telemetryService, times(1)).addMetric(metricCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + Metric metric = metricCaptor.getValue(); + assertEquals("tracers", metric.getNamespace()); + assertEquals("otel.env.invalid", metric.getMetric()); + assertEquals(1L, metric.getPoints().get(0).get(1).longValue()); + assertEquals( + Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var"), + metric.getTags()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } + + @Test + void testOtelEnvVarMultipleMetrics() { + collector.setInvalidOtelEnvVarMetric("otel_env_var", "dd_env_var"); + collector.setInvalidOtelEnvVarMetric("otel_env_var2", "dd_env_var2"); + collector.setHidingOtelEnvVarMetric("otel_service_name", "dd_service_name"); + collector.setUnsupportedOtelEnvVarMetric("unsupported_env_var"); + collector.prepareMetrics(); + action.doIteration(telemetryService); + + verify(telemetryService, times(4)).addMetric(metricCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + // MetricPeriodicAction aggregates metrics through a HashMap, so the emission order is not + // guaranteed; match each expected metric by its tags rather than by capture position. + List metrics = metricCaptor.getAllValues(); + assertMetric( + metrics, + "otel.env.invalid", + Arrays.asList("config_opentelemetry:otel_env_var", "config_datadog:dd_env_var")); + assertMetric( + metrics, + "otel.env.invalid", + Arrays.asList("config_opentelemetry:otel_env_var2", "config_datadog:dd_env_var2")); + assertMetric( + metrics, + "otel.env.hiding", + Arrays.asList("config_opentelemetry:otel_service_name", "config_datadog:dd_service_name")); + assertMetric( + metrics, "otel.env.unsupported", Arrays.asList("config_opentelemetry:unsupported_env_var")); + } + + private void assertMetric(List metrics, String metricName, List tags) { + List matches = + metrics.stream() + .filter(metric -> metric.getMetric().equals(metricName)) + .filter(metric -> tags.equals(metric.getTags())) + .collect(Collectors.toList()); + assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags); + + Metric metric = matches.get(0); + assertEquals("tracers", metric.getNamespace()); + assertEquals(1L, metric.getPoints().get(0).get(1).longValue()); + assertEquals(Metric.TypeEnum.COUNT, metric.getType()); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java new file mode 100644 index 00000000000..6340d95bdc0 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/metric/WafMetricPeriodicActionTest.java @@ -0,0 +1,196 @@ +package datadog.telemetry.metric; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +import static org.mockito.Mockito.clearInvocations; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.Metric; +import datadog.trace.api.telemetry.WafMetricCollector; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class WafMetricPeriodicActionTest { + + private final WafMetricPeriodicAction periodicAction = new WafMetricPeriodicAction(); + private final TelemetryService telemetryService = mock(TelemetryService.class); + + @Test + void pushWafMetricsIntoTheTelemetryService() { + WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", true); + WafMetricCollector.get().wafUpdates("rules_ver_2", true); + WafMetricCollector.get().wafUpdates("rules_ver_3", true); + + periodicAction.doIteration(telemetryService); + + ArgumentCaptor captor = forClass(Metric.class); + verify(telemetryService, times(3)).addMetric(captor.capture()); + verifyNoMoreInteractions(telemetryService); + + List metrics = captor.getAllValues(); + assertMetric( + metrics, + "waf.init", + 1L, + Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_1", "success:true")); + assertMetric( + metrics, + "waf.updates", + 1L, + Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_2", "success:true")); + assertMetric( + metrics, + "waf.updates", + 1L, + Arrays.asList("waf_version:0.0.0", "event_rules_version:rules_ver_3", "success:true")); + } + + @Test + void pushWafRequestMetricsAndPushIntoTheTelemetry() { + WafMetricCollector.get().wafInit("0.0.0", "rules_ver_1", 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); + + ArgumentCaptor firstBatchCaptor = forClass(Metric.class); + verify(telemetryService, times(9)).addMetric(firstBatchCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + List firstBatch = firstBatchCaptor.getAllValues(); + assertMetric(firstBatch, "waf.init", 1L, null); + assertRequestMetric( + firstBatch, + 3L, + requestTags("rules_ver_1", false, false, false, false, false, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", true, false, false, false, false, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, true, false, false, false, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, false, true, false, false, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, false, false, true, false, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, true, false, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, true, false)); + assertRequestMetric( + firstBatch, 1L, requestTags("rules_ver_1", false, false, false, false, false, false, true)); + + clearInvocations(telemetryService); + + // waf.updates happens + WafMetricCollector.get().wafUpdates("rules_ver_2", 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); + + // following waf.request have a new event_rules_version tag + ArgumentCaptor secondBatchCaptor = forClass(Metric.class); + verify(telemetryService, times(9)).addMetric(secondBatchCaptor.capture()); + verifyNoMoreInteractions(telemetryService); + + List secondBatch = secondBatchCaptor.getAllValues(); + assertMetric(secondBatch, "waf.updates", 1L, null); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, false, false, false, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", true, false, false, false, false, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, true, false, false, false, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, true, false, false, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, false, true, false, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, false, false, true, false, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, false, false, false, true, false)); + assertRequestMetric( + secondBatch, + 1L, + requestTags("rules_ver_2", false, false, false, false, false, false, true)); + } + + private void assertRequestMetric(List metrics, long expectedCount, List tags) { + assertMetric(metrics, "waf.requests", expectedCount, tags); + } + + /** + * Metrics with equal tags are aggregated into a single point by production code, but ones with + * distinct tags land in a HashMap keyed by content, so their relative order in the captured list + * is not guaranteed. Match by (metric name, tags) rather than by position. + */ + private void assertMetric( + List metrics, String metricName, long expectedCount, List tags) { + List matches = + metrics.stream() + .filter(metric -> metric.getMetric().equals(metricName)) + .filter(metric -> tags == null || tags.equals(metric.getTags())) + .collect(Collectors.toList()); + assertEquals(1, matches.size(), "expected exactly one match for " + metricName + " " + tags); + + Metric metric = matches.get(0); + assertEquals("appsec", metric.getNamespace()); + assertEquals(expectedCount, metric.getPoints().get(0).get(1).longValue()); + } + + private List requestTags( + String rulesVersion, + boolean ruleTriggered, + boolean requestBlocked, + boolean wafError, + boolean wafTimeout, + boolean blockFailure, + boolean rateLimited, + boolean inputTruncated) { + return Arrays.asList( + "waf_version:0.0.0", + "event_rules_version:" + rulesVersion, + "rule_triggered:" + ruleTriggered, + "request_blocked:" + requestBlocked, + "waf_error:" + wafError, + "waf_timeout:" + wafTimeout, + "block_failure:" + blockFailure, + "rate_limited:" + rateLimited, + "input_truncated:" + inputTruncated, + "request_excluded:none"); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java b/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java new file mode 100644 index 00000000000..d9fcdfad876 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/products/ProductChangeActionTest.java @@ -0,0 +1,37 @@ +package datadog.telemetry.products; + +import static datadog.trace.api.telemetry.ProductChange.ProductType.APPSEC; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +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 datadog.telemetry.TelemetryService; +import datadog.trace.api.telemetry.ProductChange; +import datadog.trace.api.telemetry.ProductChangeCollector; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class ProductChangeActionTest { + + private final ProductChangeAction action = new ProductChangeAction(); + private final TelemetryService telemetryService = mock(TelemetryService.class); + + @Test + void pushProductChangesIntoTheTelemetryService() { + ProductChangeCollector.get().update(new ProductChange().productType(APPSEC).enabled(true)); + + action.doIteration(telemetryService); + + ArgumentCaptor productChangeCaptor = + ArgumentCaptor.forClass(ProductChange.class); + verify(telemetryService, times(1)).addProductChange(productChangeCaptor.capture()); + ProductChange productChange = productChangeCaptor.getValue(); + assertEquals(APPSEC, productChange.getProductType()); + assertTrue(productChange.isEnabled()); + + verifyNoMoreInteractions(telemetryService); + } +} diff --git a/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java b/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java new file mode 100644 index 00000000000..83af780c9c5 --- /dev/null +++ b/telemetry/src/test/java/datadog/telemetry/rum/RumPeriodicActionTest.java @@ -0,0 +1,66 @@ +package datadog.telemetry.rum; + +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.ArgumentCaptor.forClass; +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 datadog.telemetry.TelemetryService; +import datadog.telemetry.api.DistributionSeries; +import datadog.telemetry.api.Metric; +import datadog.trace.api.rum.RumInjectorMetrics; +import datadog.trace.api.rum.RumTelemetryCollector; +import org.junit.jupiter.api.Test; +import org.mockito.ArgumentCaptor; + +class RumPeriodicActionTest { + + private final TelemetryService telemetryService = mock(TelemetryService.class); + + @Test + void pushRumMetricsIntoTheTelemetryService() { + RumInjectorMetrics metricsCollector = new RumInjectorMetrics(); + metricsCollector.onInjectionSucceed("3"); + metricsCollector.onInjectionFailed("5", "gzip"); + metricsCollector.onInjectionResponseSize("3", 1024); + + RumPeriodicAction periodicAction = new RumPeriodicAction(metricsCollector); + + periodicAction.doIteration(telemetryService); + + ArgumentCaptor metricCaptor = forClass(Metric.class); + verify(telemetryService, times(2)).addMetric(metricCaptor.capture()); + Metric succeedMetric = metricCaptor.getAllValues().get(0); + assertEquals("rum", succeedMetric.getNamespace()); + assertEquals("injection.succeed", succeedMetric.getMetric()); + assertEquals(Metric.TypeEnum.COUNT, succeedMetric.getType()); + + Metric failedMetric = metricCaptor.getAllValues().get(1); + assertEquals("rum", failedMetric.getNamespace()); + assertEquals("injection.failed", failedMetric.getMetric()); + assertEquals(Metric.TypeEnum.COUNT, failedMetric.getType()); + + ArgumentCaptor distributionCaptor = forClass(DistributionSeries.class); + verify(telemetryService, times(1)).addDistributionSeries(distributionCaptor.capture()); + DistributionSeries distribution = distributionCaptor.getValue(); + assertEquals("rum", distribution.getNamespace()); + assertEquals("injection.response.bytes", distribution.getMetric()); + + verifyNoMoreInteractions(telemetryService); + } + + @Test + void pushNothingWhenNoMetricsCollectorIsSet() { + RumPeriodicAction periodicAction = new RumPeriodicAction(RumTelemetryCollector.NO_OP); + + periodicAction.doIteration(telemetryService); + + verify(telemetryService, never()).addMetric(any()); + verify(telemetryService, never()).addDistributionSeries(any()); + verifyNoMoreInteractions(telemetryService); + } +} diff --git a/utils/config-utils/gradle.lockfile b/utils/config-utils/gradle.lockfile index 7ba76a89b69..2a1b0d7501e 100644 --- a/utils/config-utils/gradle.lockfile +++ b/utils/config-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -60,7 +61,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testFixtur org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testFixturesCompileClasspath,testFixturesRuntimeClasspath,testRuntimeClasspath diff --git a/utils/container-utils/gradle.lockfile b/utils/container-utils/gradle.lockfile index 85e7a0e22f6..5de541097f8 100644 --- a/utils/container-utils/gradle.lockfile +++ b/utils/container-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/filesystem-utils/gradle.lockfile b/utils/filesystem-utils/gradle.lockfile index eb669d750d1..cea7dc2d996 100644 --- a/utils/filesystem-utils/gradle.lockfile +++ b/utils/filesystem-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/flare-utils/gradle.lockfile b/utils/flare-utils/gradle.lockfile index 73c6203f211..823d48a629d 100644 --- a/utils/flare-utils/gradle.lockfile +++ b/utils/flare-utils/gradle.lockfile @@ -6,10 +6,11 @@ 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.datadoghq.okio:okio:1.17.6=compileClasspath +com.datadoghq:dd-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,7 +58,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/logging-utils/gradle.lockfile b/utils/logging-utils/gradle.lockfile index d1684d288d3..79a23d8f1f0 100644 --- a/utils/logging-utils/gradle.lockfile +++ b/utils/logging-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,7 +54,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs 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 diff --git a/utils/queue-utils/gradle.lockfile b/utils/queue-utils/gradle.lockfile index 9116622918d..5139f103614 100644 --- a/utils/queue-utils/gradle.lockfile +++ b/utils/queue-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/socket-utils/gradle.lockfile b/utils/socket-utils/gradle.lockfile index c53eaec1194..2f1c7646ea6 100644 --- a/utils/socket-utils/gradle.lockfile +++ b/utils/socket-utils/gradle.lockfile @@ -4,6 +4,7 @@ # 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-instrument-java:0.0.5=runtimeClasspath,testRuntimeClasspath com.datadoghq:dd-javac-plugin-client:0.2.2=runtimeClasspath,testRuntimeClasspath com.github.javaparser:javaparser-core:3.25.6=codenarc com.github.jnr:jffi:1.3.15=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath @@ -14,8 +15,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -61,7 +62,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-agent-utils/decoder/gradle.lockfile b/utils/test-agent-utils/decoder/gradle.lockfile index eb326f79421..7dc52808c96 100644 --- a/utils/test-agent-utils/decoder/gradle.lockfile +++ b/utils/test-agent-utils/decoder/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -57,7 +58,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.msgpack:msgpack-core:0.8.24=compileClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-junit-converter-utils/gradle.lockfile b/utils/test-junit-converter-utils/gradle.lockfile index 62c39983a72..ea47f58fe74 100644 --- a/utils/test-junit-converter-utils/gradle.lockfile +++ b/utils/test-junit-converter-utils/gradle.lockfile @@ -4,10 +4,11 @@ # To regenerate this file, run: ./gradlew :utils:test-junit-converter-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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -53,7 +54,6 @@ org.junit.platform:junit-platform-commons:1.14.1=compileClasspath,testCompileCla org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-junit-utils/gradle.lockfile b/utils/test-junit-utils/gradle.lockfile index b9a0c20ff80..5c5e4f67030 100644 --- a/utils/test-junit-utils/gradle.lockfile +++ b/utils/test-junit-utils/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=compileClasspath,testCompileCla org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-utils/gradle.lockfile b/utils/test-utils/gradle.lockfile index 4b154131895..78df65e886e 100644 --- a/utils/test-utils/gradle.lockfile +++ b/utils/test-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=runtimeClasspath,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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=compileClasspath,testCompileCla org.junit.platform:junit-platform-engine:1.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=compileClasspath,testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=compileClasspath,testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=compileClasspath,testCompileClasspath,testRuntimeClasspath diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java new file mode 100644 index 00000000000..aa1c90bc73d --- /dev/null +++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommand.java @@ -0,0 +1,114 @@ +package datadog.trace.test.util; + +import datadog.environment.OperatingSystem; +import datadog.trace.api.internal.VisibleForTesting; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.security.CodeSource; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * Builds portable command lines for simple test utilities. + * + *

    + *
  • POSIX uses native system commands. + *
  • Windows uses {@link PortableCommandRunner} in a child JVM to emulate their behavior. + *
+ */ +public final class PortableCommand { + private static final String MIN_HEAP = "-Xms8m"; + private static final String MAX_HEAP = "-Xmx16m"; + + /** Windows has no usable native equivalent for any of these commands. */ + private static final boolean EMULATED = OperatingSystem.isWindows(); + + private PortableCommand() {} + + public static String[] echo(String value) { + return echo(value, EMULATED); + } + + public static String[] cat() { + return cat(EMULATED); + } + + public static String[] sleep(long durationSec) { + return sleep(durationSec, EMULATED); + } + + public static String[] runForever() { + return runForever(EMULATED); + } + + @VisibleForTesting + static String[] echo(String value, boolean emulated) { + return emulated ? emulate("echo", value) : new String[] {"echo", value}; + } + + @VisibleForTesting + static String[] cat(boolean emulated) { + return emulated ? emulate("cat") : new String[] {"cat"}; + } + + @VisibleForTesting + static String[] sleep(long durationSec, boolean emulated) { + if (durationSec < 0) { + throw new IllegalArgumentException("Sleep duration must not be negative: " + durationSec); + } + // The native sleep takes seconds; the emulated runner takes milliseconds. + return emulated + ? emulate("sleep", Long.toString(durationSec * 1000)) + : new String[] {"sleep", Long.toString(durationSec)}; + } + + @VisibleForTesting + static String[] runForever(boolean emulated) { + return emulated + ? emulate("sleep", Long.toString(Long.MAX_VALUE)) + : new String[] {"tail", "-f", "/dev/null"}; + } + + private static String[] emulate(String... arguments) { + Path executable = javaExecutable(); + Path classpath = classpathEntry(); + + List command = new ArrayList<>(); + command.add(executable.toString()); + command.add(MIN_HEAP); + command.add(MAX_HEAP); + command.add("-cp"); + command.add(classpath.toString()); + command.add(PortableCommandRunner.class.getName()); + command.addAll(Arrays.asList(arguments)); + return command.toArray(new String[0]); + } + + private static Path javaExecutable() { + return javaExecutable(Paths.get(System.getProperty("java.home"))); + } + + @VisibleForTesting + static Path javaExecutable(Path javaHome) { + Path bin = javaHome.resolve("bin"); + for (String name : new String[] {"java", "java.exe"}) { + Path candidate = bin.resolve(name); + if (Files.isRegularFile(candidate)) { + return candidate; + } + } + throw new IllegalStateException("Could not find a Java executable under " + bin); + } + + private static Path classpathEntry() { + CodeSource source = PortableCommand.class.getProtectionDomain().getCodeSource(); + try { + return Paths.get(source.getLocation().toURI()); + } catch (Exception e) { + throw new IllegalStateException( + "Cannot determine the classpath of " + PortableCommand.class.getName(), e); + } + } +} diff --git a/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java new file mode 100644 index 00000000000..db47270f6ec --- /dev/null +++ b/utils/test-utils/src/main/java/datadog/trace/test/util/PortableCommandRunner.java @@ -0,0 +1,55 @@ +package datadog.trace.test.util; + +import static java.nio.charset.Charset.defaultCharset; + +import datadog.trace.api.internal.VisibleForTesting; +import de.thetaphi.forbiddenapis.SuppressForbidden; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; + +/** + * Emulates the utilities described by {@link PortableCommand} inside a JVM, for platforms that have + * no usable native equivalent. Spawned as a child process; not meant to be called directly. + */ +public final class PortableCommandRunner { + private PortableCommandRunner() {} + + @SuppressForbidden + public static void main(String[] arguments) throws IOException, InterruptedException { + execute(arguments, System.in, System.out); + System.out.flush(); + } + + @VisibleForTesting + static void execute(String[] arguments, InputStream input, OutputStream output) + throws IOException, InterruptedException { + if (arguments.length == 0) { + throw new IllegalArgumentException("Missing command"); + } + switch (arguments[0]) { + case "echo": + output.write((argument(arguments) + System.lineSeparator()).getBytes(defaultCharset())); + break; + case "cat": + byte[] buffer = new byte[8192]; + int read; + while ((read = input.read(buffer)) != -1) { + output.write(buffer, 0, read); + } + break; + case "sleep": + Thread.sleep(Long.parseLong(argument(arguments))); + break; + default: + throw new IllegalArgumentException("Unknown command: " + arguments[0]); + } + } + + private static String argument(String[] arguments) { + if (arguments.length < 2) { + throw new IllegalArgumentException("Command '" + arguments[0] + "' requires an argument"); + } + return arguments[1]; + } +} diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java new file mode 100644 index 00000000000..610e5dad584 --- /dev/null +++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandRunnerTest.java @@ -0,0 +1,79 @@ +package datadog.trace.test.util; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.InputStream; +import org.junit.jupiter.api.Test; + +/** + * Unit tests for the command dispatch. In production the runner only ever executes as a child + * process, where its behavior is covered end to end by the emulated cases of {@link + * PortableCommandTest} — but a child JVM is opaque to both the coverage report and to assertions + * about why a command misbehaved, so the dispatch is driven directly here. + */ +class PortableCommandRunnerTest { + @Test + void echoes() throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + + PortableCommandRunner.execute(new String[] {"echo", "value"}, emptyInput(), output); + + assertEquals("value" + System.lineSeparator(), new String(output.toByteArray(), UTF_8)); + } + + @Test + void copiesInput() throws Exception { + ByteArrayOutputStream output = new ByteArrayOutputStream(); + InputStream input = new ByteArrayInputStream("payload".getBytes(UTF_8)); + + PortableCommandRunner.execute(new String[] {"cat"}, input, output); + + assertEquals("payload", new String(output.toByteArray(), UTF_8)); + } + + @Test + void sleeps() throws Exception { + long start = System.nanoTime(); + + PortableCommandRunner.execute( + new String[] {"sleep", "50"}, emptyInput(), new ByteArrayOutputStream()); + + assertTrue((System.nanoTime() - start) / 1_000_000 >= 40, "sleep returned immediately"); + } + + @Test + void rejectsMissingCommand() { + assertThrows( + IllegalArgumentException.class, + () -> + PortableCommandRunner.execute( + new String[0], emptyInput(), new ByteArrayOutputStream())); + } + + @Test + void rejectsUnknownCommand() { + assertThrows( + IllegalArgumentException.class, + () -> + PortableCommandRunner.execute( + new String[] {"rm"}, emptyInput(), new ByteArrayOutputStream())); + } + + @Test + void rejectsMissingArgument() { + assertThrows( + IllegalArgumentException.class, + () -> + PortableCommandRunner.execute( + new String[] {"echo"}, emptyInput(), new ByteArrayOutputStream())); + } + + private static InputStream emptyInput() { + return new ByteArrayInputStream(new byte[0]); + } +} diff --git a/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java new file mode 100644 index 00000000000..784145e8c8b --- /dev/null +++ b/utils/test-utils/src/test/java/datadog/trace/test/util/PortableCommandTest.java @@ -0,0 +1,212 @@ +package datadog.trace.test.util; + +import static java.nio.charset.StandardCharsets.UTF_8; +import static java.util.concurrent.TimeUnit.SECONDS; +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.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assumptions.assumeTrue; + +import datadog.environment.OperatingSystem; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.io.TempDir; +import org.tabletest.junit.TableTest; + +class PortableCommandTest { + private static final long TIMEOUT_SECONDS = 20; + + // Both strategies are exercised on every platform so that the emulated path, which only ships + // on Windows, is still verified by a POSIX CI run. + + @TableTest({ + "scenario | emulated", + "native command | false ", + "emulated child JVM | true " + }) + void testEcho(boolean emulated) throws Exception { + assumeStrategySupported(emulated); + + Result result = run(PortableCommand.echo("hello", emulated), null); + + assertEquals(0, result.exitCode, result.error); + assertEquals("hello" + System.lineSeparator(), result.output); + } + + @TableTest({ + "scenario | emulated", + "native command | false ", + "emulated child JVM | true " + }) + void testCat(boolean emulated) throws Exception { + assumeStrategySupported(emulated); + + Result result = run(PortableCommand.cat(emulated), "copied".getBytes(UTF_8)); + + assertEquals(0, result.exitCode, result.error); + assertEquals("copied", result.output); + } + + @TableTest({ + "scenario | emulated", + "native command | false ", + "emulated child JVM | true " + }) + void testSleep(boolean emulated) throws Exception { + assumeStrategySupported(emulated); + + long start = System.nanoTime(); + Result result = run(PortableCommand.sleep(1, emulated), null); + long elapsedMillis = (System.nanoTime() - start) / 1_000_000; + + assertEquals(0, result.exitCode, result.error); + // A floor slightly below the requested duration keeps this robust against clock granularity + // while still failing if sleep is a no-op. + assertTrue(elapsedMillis >= 900, "slept for only " + elapsedMillis + "ms"); + } + + @TableTest({ + "scenario | emulated", + "native command | false ", + "emulated child JVM | true " + }) + void testRunForever(boolean emulated) throws Exception { + assumeStrategySupported(emulated); + + Process process = new ProcessBuilder(PortableCommand.runForever(emulated)).start(); + try { + assertFalse(process.waitFor(1, SECONDS), "runForever() must not exit on its own"); + + process.destroyForcibly(); + + assertTrue(process.waitFor(TIMEOUT_SECONDS, SECONDS), "process outlived destroyForcibly()"); + } finally { + process.destroyForcibly(); + } + } + + @Test + void publicApiSelectsStrategyForCurrentPlatform() { + boolean emulated = OperatingSystem.isWindows(); + + assertArrayEquals(PortableCommand.echo("v", emulated), PortableCommand.echo("v")); + assertArrayEquals(PortableCommand.cat(emulated), PortableCommand.cat()); + assertArrayEquals(PortableCommand.sleep(10, emulated), PortableCommand.sleep(10)); + assertArrayEquals(PortableCommand.runForever(emulated), PortableCommand.runForever()); + } + + @Test + void rejectsNegativeSleep() { + assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, false)); + assertThrows(IllegalArgumentException.class, () -> PortableCommand.sleep(-1, true)); + } + + @Test + void locatesJavaExecutableOfRunningJvm() { + Path executable = PortableCommand.javaExecutable(Paths.get(System.getProperty("java.home"))); + + assertTrue(Files.isRegularFile(executable), executable + " is not a file"); + } + + @Test + void locatesWindowsJavaExecutable(@TempDir Path javaHome) throws Exception { + Path bin = Files.createDirectory(javaHome.resolve("bin")); + Path executable = Files.createFile(bin.resolve("java.exe")); + + assertEquals(executable, PortableCommand.javaExecutable(javaHome)); + } + + @Test + void failsWhenJavaExecutableIsMissing(@TempDir Path javaHome) throws Exception { + Files.createDirectory(javaHome.resolve("bin")); + + assertThrows(IllegalStateException.class, () -> PortableCommand.javaExecutable(javaHome)); + } + + private static void assumeStrategySupported(boolean emulated) { + assumeTrue( + emulated || !OperatingSystem.isWindows(), + "native commands are only available on POSIX platforms"); + } + + private static Result run(String[] command, byte[] input) throws Exception { + Process process = new ProcessBuilder(command).start(); + try { + // Both streams are drained concurrently: waiting for the process to exit before reading + // deadlocks as soon as either pipe buffer fills. + Drain output = Drain.of(process.getInputStream()); + Drain error = Drain.of(process.getErrorStream()); + + try (OutputStream stdin = process.getOutputStream()) { + if (input != null) { + stdin.write(input); + } + } + + assertTrue( + process.waitFor(TIMEOUT_SECONDS, SECONDS), + () -> "command timed out: " + String.join(" ", command)); + return new Result(process.exitValue(), output.text(), error.text()); + } finally { + process.destroyForcibly(); + } + } + + private static final class Result { + final int exitCode; + final String output; + final String error; + + Result(int exitCode, String output, String error) { + this.exitCode = exitCode; + this.output = output; + this.error = error; + } + } + + private static final class Drain extends Thread { + private final InputStream input; + private final ByteArrayOutputStream output = new ByteArrayOutputStream(); + private volatile IOException failure; + + private Drain(InputStream input) { + this.input = input; + setDaemon(true); + } + + static Drain of(InputStream input) { + Drain drain = new Drain(input); + drain.start(); + return drain; + } + + @Override + public void run() { + byte[] buffer = new byte[8192]; + try { + int read; + while ((read = input.read(buffer)) != -1) { + output.write(buffer, 0, read); + } + } catch (IOException e) { + failure = e; + } + } + + String text() throws Exception { + join(SECONDS.toMillis(TIMEOUT_SECONDS)); + if (failure != null) { + throw failure; + } + return new String(output.toByteArray(), UTF_8); + } + } +} diff --git a/utils/time-utils/gradle.lockfile b/utils/time-utils/gradle.lockfile index bde84cdd05f..cab0d316700 100644 --- a/utils/time-utils/gradle.lockfile +++ b/utils/time-utils/gradle.lockfile @@ -4,10 +4,11 @@ # 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-instrument-java:0.0.5=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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -55,7 +56,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath diff --git a/utils/version-utils/gradle.lockfile b/utils/version-utils/gradle.lockfile index 9d02e46fb5f..725c480f553 100644 --- a/utils/version-utils/gradle.lockfile +++ b/utils/version-utils/gradle.lockfile @@ -5,8 +5,8 @@ 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.10.3=compileClasspath,spotbugs -com.github.spotbugs:spotbugs:4.10.3=spotbugs +com.github.spotbugs:spotbugs-annotations:4.10.4=compileClasspath,spotbugs +com.github.spotbugs:spotbugs:4.10.4=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.14.0=spotbugs @@ -52,7 +52,6 @@ org.junit.platform:junit-platform-commons:1.14.1=testCompileClasspath,testRuntim org.junit.platform:junit-platform-engine:1.14.1=testCompileClasspath,testRuntimeClasspath org.junit.platform:junit-platform-launcher:1.14.1=testRuntimeClasspath org.junit:junit-bom:5.14.1=testCompileClasspath,testRuntimeClasspath -org.junit:junit-bom:6.1.2=spotbugs org.mockito:mockito-core:4.4.0=testRuntimeClasspath org.objenesis:objenesis:3.3=testCompileClasspath,testRuntimeClasspath org.opentest4j:opentest4j:1.3.0=testCompileClasspath,testRuntimeClasspath