Merge branch 'master' into sarahchen6/move-macrobenchmarks

Author: sarahchen6

.github/CODEOWNERS

@@ -4,17 +4,34 @@
 # Default owners, overridden by file/directory specific owners below
 * @DataDog/apm-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
+/dd-smoke-tests/armeria-grpc/                                                                    @DataDog/apm-idm-java
+/dd-smoke-tests/cli/                                                                             @DataDog/apm-idm-java
+/dd-smoke-tests/jersey-2/                                                                        @DataDog/apm-idm-java
+/dd-smoke-tests/jersey-3/                                                                        @DataDog/apm-idm-java
+/dd-smoke-tests/play-*/                                                                          @DataDog/apm-idm-java
+/dd-smoke-tests/quarkus/                                                                         @DataDog/apm-idm-java
+/dd-smoke-tests/quarkus-native/                                                                  @DataDog/apm-idm-java
+/dd-smoke-tests/ratpack-1.5/                                                                     @DataDog/apm-idm-java
+/dd-smoke-tests/resteasy/                                                                        @DataDog/apm-idm-java
+/dd-smoke-tests/spring*/                                                                         @DataDog/apm-idm-java
+/dd-smoke-tests/vertx-*/                                                                         @DataDog/apm-idm-java
+/dd-smoke-tests/wildfly/                                                                         @DataDog/apm-idm-java
 
 # @DataDog/apm-release-platform
 /.gitlab/                              @DataDog/apm-release-platform
 /.gitlab-ci.yml                        @DataDog/apm-release-platform
 
 # @DataDog/apm-sdk-capabilities-java
 /dd-java-agent/agent-otel                                       @DataDog/apm-sdk-capabilities-java
+/dd-smoke-tests/log-injection                                   @DataDog/apm-sdk-capabilities-java
+/dd-smoke-tests/opentelemetry                                   @DataDog/apm-sdk-capabilities-java
+/dd-smoke-tests/opentracing                                     @DataDog/apm-sdk-capabilities-java
 /dd-smoke-tests/sample-trace                                    @DataDog/apm-sdk-capabilities-java
+/dd-smoke-tests/tracer-flare                                    @DataDog/apm-sdk-capabilities-java
 /dd-trace-core/src/main/java/datadog/trace/core/baggage         @DataDog/apm-sdk-capabilities-java
 /dd-trace-core/src/test/groovy/datadog/trace/core/baggage       @DataDog/apm-sdk-capabilities-java
 /dd-trace-core/src/main/java/datadog/trace/core/propagation     @DataDog/apm-sdk-capabilities-java
@@ -34,15 +51,17 @@
 **/InferredProxy*.groovy                                        @DataDog/apm-serverless
 
 # @DataDog/apm-lang-platform-java
-/.circleci/                            @DataDog/apm-lang-platform-java
-/.github/                              @DataDog/apm-lang-platform-java
-/benchmark/                            @DataDog/apm-lang-platform-java
-/components/                           @DataDog/apm-lang-platform-java
-/dd-java-agent/instrumentation/java-*  @DataDog/apm-lang-platform-java
-/metadata/                             @DataDog/apm-lang-platform-java
-/remote-config/                        @DataDog/apm-lang-platform-java
-/telemetry/                            @DataDog/apm-lang-platform-java
-/test-published-dependencies/          @DataDog/apm-lang-platform-java
+/.circleci/                             @DataDog/apm-lang-platform-java
+/.github/                               @DataDog/apm-lang-platform-java
+/benchmark/                             @DataDog/apm-lang-platform-java
+/components/                            @DataDog/apm-lang-platform-java
+/dd-java-agent/instrumentation/java-*/  @DataDog/apm-lang-platform-java
+/dd-smoke-tests/concurrent/             @DataDog/apm-lang-platform-java
+/dd-smoke-tests/lib-injection/          @DataDog/apm-lang-platform-java
+/metadata/                              @DataDog/apm-lang-platform-java
+/remote-config/                         @DataDog/apm-lang-platform-java
+/telemetry/                             @DataDog/apm-lang-platform-java
+/test-published-dependencies/           @DataDog/apm-lang-platform-java
 
 # @DataDog/asm-java (AppSec/IAST)
 /buildSrc/call-site-instrumentation-plugin/                     @DataDog/asm-java
@@ -56,6 +75,9 @@
 /dd-java-agent/instrumentation/velocity-1.5/                    @DataDog/asm-java
 /dd-java-agent/instrumentation/freemarker/                      @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/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/              @DataDog/asm-java
@@ -99,9 +121,9 @@
 
 # @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/main/java/datadog/trace/api/debugger/         @DataDog/debugger-java
-/dd-java-agent/instrumentation/datadog/dynamic-instrumentation/ @DataDog/debugger-java
 
 
 # @DataDog/data-jobs-monitoring
@@ -112,26 +134,29 @@
 /dd-trace-core/src/main/java/datadog/trace/core/datastreams                  @DataDog/data-streams-monitoring
 /dd-trace-core/src/test/groovy/datadog/trace/core/datastreams                @DataDog/data-streams-monitoring
 /internal-api/src/main/java/datadog/trace/api/datastreams                    @DataDog/data-streams-monitoring
+/dd-smoke-tests/datastreams/                                                 @DataDog/data-streams-monitoring
 /internal-api/src/test/groovy/datadog/trace/api/datastreams                  @DataDog/data-streams-monitoring
 **/datastreams/                                                              @DataDog/data-streams-monitoring
 **/DataStreams*                                                              @DataDog/data-streams-monitoring
 **/dsmTest/**                                                                @DataDog/data-streams-monitoring
 
-/dd-java-agent/instrumentation/confluent-schema-registry/       @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/avro/                            @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/protobuf-3.0/                    @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/               @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/google-pubsub/                   @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/        @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
 /dd-java-agent/instrumentation/aws-java/aws-java-sns-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/kafka/kafka-clients-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/         @DataDog/data-streams-monitoring @DataDog/apm-idm-java
-/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sqs-1.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/aws-java/aws-java-sqs-2.0/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/confluent-schema-registry/       @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/google-pubsub/                   @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 /dd-java-agent/instrumentation/grpc-1.5/                        @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/kafka/kafka-clients-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-clients-3.8/         @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-connect-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/kafka/kafka-streams-0.11/        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/protobuf-3.0/                    @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-java-agent/instrumentation/rabbitmq-amqp-2.7/               @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-smoke-tests/kafka-2/                                        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
+/dd-smoke-tests/kafka-3/                                        @DataDog/data-streams-monitoring @DataDog/apm-idm-java
 
 # @DataDog/feature-flagging-and-experimentation-sdk
 /dd-smoke-tests/openfeature/                                    @DataDog/feature-flagging-and-experimentation-sdk
@@ -144,20 +169,21 @@
 /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
+/dd-smoke-tests/profiling-integration-tests/                                                @DataDog/profiling-java
 /dd-trace-api/src/main/java/datadog/trace/api/profiling                                     @DataDog/profiling-java
 /internal-api/src/main/java/datadog/trace/api/profiling                                     @DataDog/profiling-java
 /internal-api/src/main/java/datadog/trace/api/EndpointCheckpointer.java                     @DataDog/profiling-java
 /internal-api/src/main/java/datadog/trace/api/EndpointTracker.java                          @DataDog/profiling-java
-/dd-smoke-tests/profiling-integration-tests/                                                @DataDog/profiling-java
 
 # @DataDog/ml-observability
-dd-trace-api/src/main/java/datadog/trace/api/llmobs/ @DataDog/ml-observability
-dd-java-agent/agent-llmobs/                          @DataDog/ml-observability
-dd-trace-core/src/main/java/datadog/trace/llmobs/    @DataDog/ml-observability
-dd-trace-core/src/test/groovy/datadog/trace/llmobs/  @DataDog/ml-observability
+/dd-trace-api/src/main/java/datadog/trace/api/llmobs/ @DataDog/ml-observability
+/dd-java-agent/agent-llmobs/                          @DataDog/ml-observability
+/dd-trace-core/src/main/java/datadog/trace/llmobs/    @DataDog/ml-observability
+/dd-trace-core/src/test/groovy/datadog/trace/llmobs/  @DataDog/ml-observability
 
 # @DataDog/database-monitoring
-datadog/trace/bootstrap/instrumentation/dbm @DataDog/database-monitoring @DataDog/apm-idm-java
+datadog/trace/bootstrap/instrumentation/dbm  @DataDog/database-monitoring @DataDog/apm-idm-java
 
 # @DataDog/rum
 /internal-api/src/main/java/datadog/trace/api/rum/   @DataDog/rum

.github/workflows/analyze-changes.yaml

@@ -20,7 +20,7 @@ jobs:
         with:
           submodules: 'recursive'
       - name: Cache Gradle dependencies
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.gradle/caches
@@ -30,7 +30,7 @@ jobs:
             ${{ runner.os }}-gradle-
         
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/init@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         with:
           languages: 'java'
           build-mode: 'manual'
@@ -49,7 +49,7 @@ jobs:
             --build-cache --parallel --stacktrace --no-daemon --max-workers=4
 
       - name: Perform CodeQL Analysis and upload results to GitHub Security tab
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/analyze@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
 
   trivy:
     name: Analyze changes with Trivy
@@ -66,7 +66,7 @@ jobs:
           submodules: 'recursive'
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.gradle/caches
@@ -114,7 +114,7 @@ jobs:
           TRIVY_JAVA_DB_REPOSITORY: ghcr.io/aquasecurity/trivy-java-db,public.ecr.aws/aquasecurity/trivy-java-db
 
       - name: Upload Trivy scan results to GitHub Security tab
-        uses: github/codeql-action/upload-sarif@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/upload-sarif@cdefb33c0f6224e58673d9004f47f7cb3e328b89 # v4.31.10
         if: always()
         with:
           sarif_file: 'trivy-results.sarif'

.github/workflows/pin-system-tests.yaml

@@ -7,10 +7,19 @@ on:
         description: 'The minor release branch name (e.g. release/v1.54.x)'
         required: true
         type: string
-  # run workflow when a release branch is created
+  # run workflow when any branch is created
   create:
 
 jobs:
+  # TODO: Remove this job after confirming the github.ref when a release branch is created
+  print-github-ref:
+    name: "Print full github.ref"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Print github.ref
+        run: |
+          echo "github.ref: ${{ github.ref }}"
+
   pin-system-tests:
     name: "Pin system tests"
     if: github.event_name != 'create' || contains(github.ref, 'release/v')
@@ -25,10 +34,6 @@ jobs:
           scope: DataDog/dd-trace-java
           policy: self.pin-system-tests.create-pr
 
-      # temporary
-      - name: Print github.ref
-        run: echo "github.ref: ${{ github.ref }}"
-      
       - name: Define base branch
         id: define-base-branch
         run: |

.github/workflows/run-system-tests.yaml

@@ -21,8 +21,6 @@ jobs:
   build:
     runs-on:
       group: APM Larger Runners
-    environment:
-      name: ci-build
     steps:
       - name: Checkout repository
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # 6.0.1
@@ -31,7 +29,7 @@ jobs:
           fetch-depth: 0
 
       - name: Cache Gradle dependencies
-        uses: actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: actions/cache@8b402f58fbc84540c8b491a91e594a4576fec3d7 # v5.0.2
         with:
           path: |
             ~/.gradle/caches
@@ -64,7 +62,8 @@ jobs:
     - build
     # If you change the following comment, update the pattern in the update_system_test_reference.sh script to match.
     uses: DataDog/system-tests/.github/workflows/system-tests.yml@main # system tests are pinned for releases only
-    secrets: inherit
+    secrets:
+      TEST_OPTIMIZATION_API_KEY: ${{ secrets.DATADOG_API_KEY_PROD }}
     permissions:
       contents: read
       id-token: write
@@ -76,8 +75,9 @@ jobs:
       binaries_artifact: binaries
       desired_execution_time: 900  # 15 minutes
       scenarios_groups: tracer-release
-      excluded_scenarios: CROSSED_TRACING_LIBRARIES,INTEGRATIONS_AWS,APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING  # require AWS and datadog credentials 
+      excluded_scenarios: APM_TRACING_E2E_OTEL,APM_TRACING_E2E_SINGLE_SPAN,PROFILING  # exclude flaky scenarios
       skip_empty_scenarios: true
+      push_to_test_optimization: true
 
   # Ensure the main job is run to completion
   check: