Merge branch 'master' into nikita-tkachenko/pekko-scheduler-instrumentation

Author: nikita-tkachenko-datadog

.circleci/config.continue.yml.j2

@@ -850,8 +850,6 @@ jobs:
             (
             echo "
             DEFAULT
-            APM_TRACING_E2E
-            APM_TRACING_E2E_SINGLE_SPAN
             TRACING_CONFIG_NONDEFAULT
             TRACING_CONFIG_NONDEFAULT_2
             TRACING_CONFIG_NONDEFAULT_3
@@ -875,14 +873,8 @@ jobs:
               "
             fi
             ) | circleci tests split > scenarios.list
+            export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
             for scenario in $(<scenarios.list); do
-              if [[ $scenario =~ .*_E2E.* ]]; then
-                export DD_SITE=datadoghq.com
-                export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
-                export DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY
-              else
-                export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
-              fi
               echo "Running scenario $scenario"
               ./run.sh $scenario
             done
@@ -922,27 +914,11 @@ jobs:
 
       - run:
           name: Run APM Integrations tests
-          environment:
-            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
-            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
-            - AWS_REGION: us-east-1
-            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
           # Stop the job after 5m to avoid excessive overhead. Will need adjustment as more tests are added.
           no_output_timeout: 5m
           command: |
             cd system-tests
-            DD_SITE=datadoghq.com DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY DD_APPLICATION_KEY=$SYSTEM_TESTS_E2E_DD_APP_KEY ./run.sh INTEGRATIONS
-
-      - run:
-          name: Run IDM Crossed Tracing Libraries propagation tests for messaging
-          environment:
-            - AWS_ACCESS_KEY_ID: $SYSTEM_TESTS_IDM_AWS_ACCESS_KEY_ID
-            - AWS_SECRET_ACCESS_KEY: $SYSTEM_TESTS_IDM_AWS_SECRET_ACCESS_KEY
-            - AWS_REGION: us-east-1
-            - AWS_DEFAULT_REGION: us-east-1  # AWS services should use `AWS_REGION`, but some still use the older `AWS_DEFAULT_REGION`
-          command: |
-            cd system-tests
-            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh CROSSED_TRACING_LIBRARIES
+            DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY ./run.sh INTEGRATIONS
 
       - store_test_results:
           path: system-tests/logs_integrations
@@ -975,7 +951,7 @@ jobs:
           no_output_timeout: 5m
           command: |
             cd system-tests
-            export DD_API_KEY=$SYSTEM_TESTS_E2E_DD_API_KEY
+            export DD_API_KEY=$SYSTEM_TESTS_DD_API_KEY
             ./run.sh DEBUGGER_SCENARIOS
 
       - run:

.github/workflows/README.md

@@ -129,6 +129,14 @@ _Action:_ Create a PR updating the Grade dependencies and their locking files.
 
 _Recovery:_ Manually trigger the action again.
 
+### run-system-tests [🔗](run-system-tests.yaml)
+
+_Trigger:_ When pushing commits to `master` or manually.
+
+_Action:_ Build the Java Client Library and runs [the system tests](https://github.com/DataDog/system-tests) against.
+
+_Recovery:_ Manually trigger the action on the desired branch.
+
 
 ## Maintenance
 

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

@@ -1,4 +1,4 @@
-name: system-tests
+name: Run system tests
 
 on:
   pull_request:
@@ -29,7 +29,7 @@ jobs:
           key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
           restore-keys: |
             ${{ runner.os }}-gradle-
-      
+
       - name: Build dd-trace-java
         run: |
           GRADLE_OPTS="-Xms2g -Xmx4g -XX:+HeapDumpOnOutOfMemoryError -XX:+UseParallelGC" \