From f2ceeddf42aed1af8be5bacc498287fdc943190f Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 24 Aug 2026 11:23:31 -0400 Subject: [PATCH 1/3] Add 'Shared trace protocol' section to CODEOWNERS --- .github/CODEOWNERS | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 507c6531b20..f6e2dbae9eb 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -104,6 +104,13 @@ /internal-api/src/test/java/constructors/ @DataDog/apm-java /internal-api/src/test/resources/ @DataDog/apm-java +# Shared trace protocol +/utils/test-agent-utils/ @DataDog/apm-lang-platform-java @DataDog/apm-sdk-capabilities-java +/dd-trace-api/src/**/*ProtocolVersion* @DataDog/apm-lang-platform-java @DataDog/apm-sdk-capabilities-java +/dd-trace-core/src/**/*TraceMapper* @DataDog/apm-lang-platform-java @DataDog/apm-sdk-capabilities-java +/dd-trace-core/src/**/datadog/trace/common/writer/ddagent/PayloadVerifiers* @DataDog/apm-lang-platform-java @DataDog/apm-sdk-capabilities-java +/dd-trace-core/src/**/datadog/trace/common/writer/ddagent/V1PayloadReader* @DataDog/apm-lang-platform-java @DataDog/apm-sdk-capabilities-java + # @DataDog/apm-idm-java /dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/decorator/ @DataDog/apm-idm-java /dd-java-agent/instrumentation/ @DataDog/apm-idm-java @@ -215,7 +222,6 @@ /gradle/wrapper/ @DataDog/apm-lang-platform-java /repository.datadog.yaml @DataDog/apm-lang-platform-java /dd-trace-api/**/RemoteConfigConfig* @DataDog/apm-lang-platform-java -/utils/test-agent-utils/ @DataDog/apm-lang-platform-java /utils/test-junit-converter-utils/ @DataDog/apm-lang-platform-java /utils/test-junit-utils/ @DataDog/apm-lang-platform-java /utils/test-utils/ @DataDog/apm-lang-platform-java From f835f793e31192765e46434ad9cca8a68a00fdf8 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 24 Aug 2026 11:54:56 -0400 Subject: [PATCH 2/3] Add IDM as CODEOWNERS for all instrumentations --- .github/CODEOWNERS | 82 +++++++++++++++++++++++++--------------------- 1 file changed, 45 insertions(+), 37 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index f6e2dbae9eb..147922f9829 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -13,7 +13,6 @@ /SECURITY.md @DataDog/apm-java /SUPPORT.md @DataDog/apm-java /dd-smoke-tests/README.md @DataDog/apm-java -/dd-smoke-tests/gradle.lockfile @DataDog/apm-java /docs/ @DataDog/apm-java # Shared communication @@ -43,11 +42,9 @@ /dd-java-agent/benchmark-integration/ @DataDog/apm-java /dd-java-agent/benchmark/ @DataDog/apm-java /dd-java-agent/cws-tls/ @DataDog/apm-java -/dd-java-agent/gradle.lockfile @DataDog/apm-java /dd-java-agent/load-generator/ @DataDog/apm-java # Core tracing API -/dd-trace-api/gradle.lockfile @DataDog/apm-java /dd-trace-api/src/*/*/datadog/trace/api/*.* @DataDog/apm-java /dd-trace-api/**/config/CwsConfig* @DataDog/apm-java /dd-trace-api/**/config/GeneralConfig* @DataDog/apm-java @@ -59,7 +56,6 @@ /dd-trace-api/src/*/*/datadog/trace/payloadtags/ @DataDog/apm-java # Core tracer -/dd-trace-core/gradle.lockfile @DataDog/apm-java /dd-trace-core/src/test @DataDog/apm-java /dd-trace-core/src/*/*/datadog/context/*.* @DataDog/apm-java /dd-trace-core/src/*/*/datadog/trace/api/naming/ @DataDog/apm-java @@ -82,7 +78,6 @@ /dd-trace-core/src/traceAgentTest/ @DataDog/apm-java # Core internal API -/internal-api/gradle.lockfile @DataDog/apm-java /internal-api/internal-api-9/ @DataDog/apm-java /internal-api/src/test @DataDog/apm-java /internal-api/src/*/*/datadog/trace/advice/ @DataDog/apm-java @@ -169,12 +164,13 @@ /utils/flare-utils/ @DataDog/apm-sdk-capabilities-java # @DataDog/apm-serverless -/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/ @DataDog/apm-serverless -/dd-java-agent/instrumentation/azure-functions/ @DataDog/apm-serverless -/dd-java-agent/instrumentation/azure-functions-1.2.2/ @DataDog/apm-serverless /dd-trace-core/src/*/*/datadog/trace/lambda/ @DataDog/apm-serverless /utils/container-utils/ @DataDog/apm-serverless **/InferredProxy* @DataDog/apm-serverless +/dd-java-agent/instrumentation/**/*InferredProxy* @DataDog/apm-serverless @DataDog/apm-idm-java +/dd-java-agent/instrumentation/aws-java/aws-java-lambda-handler-1.2/ @DataDog/apm-serverless @DataDog/apm-idm-java +/dd-java-agent/instrumentation/azure-functions/ @DataDog/apm-serverless @DataDog/apm-idm-java +/dd-java-agent/instrumentation/azure-functions-1.2.2/ @DataDog/apm-serverless @DataDog/apm-idm-java # @DataDog/apm-lang-platform-java /.editorconfig @DataDog/apm-lang-platform-java @@ -194,7 +190,6 @@ /dd-java-agent/agent-installer/ @DataDog/apm-lang-platform-java /dd-java-agent/agent-tooling/ @DataDog/apm-lang-platform-java /dd-java-agent/instrumentation-annotation-processor/ @DataDog/apm-lang-platform-java -/dd-java-agent/instrumentation/java/ @DataDog/apm-lang-platform-java /dd-java-agent/src/ @DataDog/apm-lang-platform-java /dd-smoke-tests/concurrent/ @DataDog/apm-lang-platform-java /dd-smoke-tests/field-injection/ @DataDog/apm-lang-platform-java @@ -202,7 +197,6 @@ /dd-smoke-tests/lib-injection/ @DataDog/apm-lang-platform-java /dd-smoke-tests/src/ @DataDog/apm-lang-platform-java /gradle/ @DataDog/apm-lang-platform-java -/gradle.lockfile @DataDog/apm-lang-platform-java /gradle.properties @DataDog/apm-lang-platform-java /gradlew @DataDog/apm-lang-platform-java /gradlew.bat @DataDog/apm-lang-platform-java @@ -225,6 +219,7 @@ /utils/test-junit-converter-utils/ @DataDog/apm-lang-platform-java /utils/test-junit-utils/ @DataDog/apm-lang-platform-java /utils/test-utils/ @DataDog/apm-lang-platform-java +/dd-java-agent/instrumentation/java/ @DataDog/apm-lang-platform-java @DataDog/apm-idm-java # @DataDog/asm-java (AppSec/IAST) /buildSrc/call-site-instrumentation-plugin/ @DataDog/asm-java @@ -236,14 +231,6 @@ /dd-java-agent/agent-aiguard/ @DataDog/asm-java /dd-java-agent/agent-iast/ @DataDog/asm-java /dd-java-agent/appsec/appsec-test-fixtures/ @DataDog/asm-java -/dd-java-agent/instrumentation/*iast* @DataDog/asm-java -/dd-java-agent/instrumentation/*appsec* @DataDog/asm-java -/dd-java-agent/instrumentation/org-json-20230227/ @DataDog/asm-java -/dd-java-agent/instrumentation/snakeyaml-1.33/ @DataDog/asm-java -/dd-java-agent/instrumentation/velocity-1.5/ @DataDog/asm-java -/dd-java-agent/instrumentation/freemarker/ @DataDog/asm-java -/dd-java-agent/instrumentation/beanshell-2.0/ @DataDog/asm-java -/dd-java-agent/instrumentation/datadog/asm/ @DataDog/asm-java /dd-smoke-tests/apm-tracing-disabled/ @DataDog/asm-java /dd-smoke-tests/appsec/ @DataDog/asm-java /dd-smoke-tests/dynamic-config/**/AppSecApplication.java @DataDog/asm-java @@ -251,8 +238,6 @@ /dd-smoke-tests/iast-propagation/ @DataDog/asm-java /dd-smoke-tests/iast-util/ @DataDog/asm-java /dd-smoke-tests/spring-security/ @DataDog/asm-java -/dd-java-agent/instrumentation/commons-fileupload-1.5/ @DataDog/asm-java -/dd-java-agent/instrumentation/spring/spring-security/ @DataDog/asm-java /dd-trace-api/src/*/*/datadog/trace/api/aiguard/ @DataDog/asm-java /dd-trace-api/src/*/*/datadog/trace/api/EventTracker* @DataDog/asm-java /internal-api/src/*/*/datadog/trace/api/gateway/ @DataDog/asm-java @@ -265,26 +250,31 @@ **/*CallSite* @DataDog/asm-java **/iast/ @DataDog/asm-java **/Iast* @DataDog/asm-java -**/rasp/ @Datadog/asm-java +**/rasp/ @DataDog/asm-java /dd-trace-api/**/config/AIGuardConfig* @DataDog/asm-java /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/**/*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 +/dd-java-agent/instrumentation/freemarker/ @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/org-json-20230227/ @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/snakeyaml-1.33/ @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/spring/spring-security/ @DataDog/asm-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/velocity-1.5/ @DataDog/asm-java @DataDog/apm-idm-java # @DataDog/ci-app-libraries /dd-java-agent/agent-ci-visibility/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/cucumber-5.4/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/jacoco-0.8.9/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/junit @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/robolectric-4.13/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/scalatest-3.0.8/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/selenium-3.13/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/gradle-testing-5.1/ @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/maven @DataDog/ci-app-libraries -/dd-java-agent/instrumentation/weaver-0.9/ @DataDog/ci-app-libraries /dd-smoke-tests/backend-mock/ @DataDog/ci-app-libraries /dd-smoke-tests/gradle/ @DataDog/ci-app-libraries /dd-smoke-tests/junit-console/ @DataDog/ci-app-libraries @@ -292,16 +282,30 @@ /internal-api/src/*/*/datadog/trace/api/git/ @DataDog/ci-app-libraries **/civisibility/ @DataDog/ci-app-libraries **/CiVisibility* @DataDog/ci-app-libraries +/dd-java-agent/instrumentation/**/civisibility/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*CiVisibility* @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/cucumber-5.4/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/jacoco-0.8.9/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/junit @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/karate/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/robolectric-4.13/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/scalatest-3.0.8/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/selenium-3.13/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/testng/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/gradle/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/gradle-testing-5.1/ @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/maven @DataDog/ci-app-libraries @DataDog/apm-idm-java +/dd-java-agent/instrumentation/weaver-0.9/ @DataDog/ci-app-libraries @DataDog/apm-idm-java # @DataDog/debugger-java (Live Debugger) /dd-java-agent/agent-debugger/ @DataDog/debugger-java -/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/ @DataDog/debugger-java /dd-smoke-tests/debugger-integration-tests/ @DataDog/debugger-java /internal-api/src/*/*/datadog/trace/api/debugger/ @DataDog/debugger-java /dd-trace-api/**/config/DebuggerConfig* @DataDog/debugger-java +/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/ @DataDog/debugger-java @DataDog/apm-idm-java # @DataDog/data-observability -/dd-java-agent/instrumentation/spark/ @DataDog/data-observability +/dd-java-agent/instrumentation/spark/ @DataDog/data-observability @DataDog/apm-idm-java # @DataDog/data-streams-monitoring /dd-java-agent/instrumentation-testing/src/main/groovy/datadog/trace/agent/test/datastreams @DataDog/data-streams-monitoring @@ -311,6 +315,9 @@ **/datastreams/ @DataDog/data-streams-monitoring **/DataStreams* @DataDog/data-streams-monitoring **/dsmTest/** @DataDog/data-streams-monitoring +/dd-java-agent/instrumentation/**/datastreams/ @DataDog/data-streams-monitoring @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/*DataStreams* @DataDog/data-streams-monitoring @DataDog/apm-idm-java +/dd-java-agent/instrumentation/**/dsmTest/** @DataDog/data-streams-monitoring @DataDog/apm-idm-java /dd-java-agent/instrumentation/armeria/armeria-grpc-0.84/ @DataDog/data-streams-monitoring @DataDog/apm-idm-java /dd-java-agent/instrumentation/aws-java/aws-java-sns-1.0/ @DataDog/data-streams-monitoring @DataDog/apm-idm-java @@ -336,8 +343,6 @@ /dd-java-agent/ddprof-lib/ @DataDog/profiling-java /dd-java-agent/agent-profiling/ @DataDog/profiling-java /dd-java-agent/agent-crashtracking/ @DataDog/profiling-java -/dd-java-agent/instrumentation/datadog/profiling/ @DataDog/profiling-java -/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-java-agent/agent-bootstrap/src/main/java11/datadog/trace/bootstrap/instrumentation/jfr/ @DataDog/profiling-java /dd-smoke-tests/crashtracking/ @DataDog/profiling-java @@ -348,6 +353,8 @@ /internal-api/src/main/java/datadog/trace/api/EndpointTracker.java @DataDog/profiling-java /dd-trace-api/**/config/CrashTrackingConfig* @DataDog/profiling-java /dd-trace-api/**/config/ProfilingConfig* @DataDog/profiling-java +/dd-java-agent/instrumentation/datadog/profiling/ @DataDog/profiling-java @DataDog/apm-idm-java +/dd-java-agent/instrumentation/java/java-nio-1.8/ @DataDog/profiling-java @DataDog/apm-idm-java # @DataDog/ml-observability /dd-trace-api/src/*/*/datadog/trace/api/llmobs/ @DataDog/ml-observability @@ -369,3 +376,4 @@ # Build configuration **/build.gradle @DataDog/apm-lang-platform-java **/build.gradle.kts @DataDog/apm-lang-platform-java +**/gradle.lockfile @DataDog/apm-java From 4f1d30416a6e17432a63fe64bb5b67f193aef8b5 Mon Sep 17 00:00:00 2001 From: Sarah Chen Date: Mon, 24 Aug 2026 13:29:34 -0400 Subject: [PATCH 3/3] Separate instrumentation lockfiles for IDM --- .github/CODEOWNERS | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 147922f9829..713b22f16f4 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -374,6 +374,7 @@ /dd-trace-api/**/config/RumConfig* @DataDog/rum # Build configuration -**/build.gradle @DataDog/apm-lang-platform-java -**/build.gradle.kts @DataDog/apm-lang-platform-java -**/gradle.lockfile @DataDog/apm-java +**/build.gradle @DataDog/apm-lang-platform-java +**/build.gradle.kts @DataDog/apm-lang-platform-java +**/gradle.lockfile @DataDog/apm-lang-platform-java +/dd-java-agent/instrumentation/**/gradle.lockfile @DataDog/apm-idm-java