Merge branch 'main' into mtoff/java-config-sources

Author: mtoffl01

.github/CODEOWNERS

@@ -15,6 +15,7 @@
 /utils/telemetry/intake/static/ @DataDog/apm-sdk
 
 /tests/parametric/ @mabdinur @DataDog/system-tests-core @DataDog/apm-sdk-capabilities
+/tests/parametric/test_config_consistency.py @DataDog/apm-sdk-capabilities
 /tests/otel_tracing_e2e/ @DataDog/opentelemetry @DataDog/system-tests-core
 /tests/remote_config/ @DataDog/remote-config @DataDog/system-tests-core
 /tests/appsec/ @DataDog/asm-libraries @DataDog/system-tests-core
@@ -34,4 +35,4 @@
 /manifests/ruby.yml @DataDog/ruby-guild @DataDog/asm-ruby
 /manifests/rust.yml @DataDog/apm-rust
 
-
+/.github/chainguard/** @DataDog/system-tests-core # Security sensitive

.github/actions/pull_images/action.yml

@@ -48,7 +48,7 @@ runs:
       with:
         shell: bash
         command: docker compose pull
-        timeout_minutes: 10
+        timeout_minutes: 15
         retry_wait_seconds: 10
         max_attempts: 3
 

.github/chainguard/self.test-activation.sts.yaml

@@ -0,0 +1,13 @@
+# Docs: https://datadoghq.atlassian.net/wiki/spaces/SECENG/pages/5138645099/User+guide+dd-octo-sts
+issuer: https://token.actions.githubusercontent.com
+
+subject: repo:DataDog/system-tests-dashboard:ref:refs/heads/main
+claim_pattern:
+  event_name: (workflow_dispatch|schedule)
+  ref: refs/heads/main
+  ref_protected: "true"
+  job_workflow_ref: DataDog/system-tests-dashboard/\.github/workflows/nightly\.yml@refs/heads/main
+
+permissions:
+  contents: write
+  pull_requests: write

.github/workflows/codeowners.yml

@@ -0,0 +1,43 @@
+name: Codeowners
+
+on:
+  pull_request:
+  workflow_call:
+
+jobs:
+  report_codeowners:
+    name: "Report codeowners"
+    runs-on: ubuntu-latest
+    permissions:
+       pull-requests: write
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+          fetch-depth: 0
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/changed-files@ed68ef82c095e0d48ec87eccea555d944a631a4c # v46.0.5
+      - name: Setup go
+        uses: actions/setup-go@d35c59abb061a4a6fb18e82ac0862c26744d6ab5 # v5.5.0
+      - name: Install codeowners
+        run: go install github.com/hmarr/codeowners/cmd/codeowners@b0f609d21eb672b5cb2973f47a80210185102504
+      - name: List owners of all changed files
+        id: codeowners_resolved
+        run: |
+          codeowners ${{ steps.changed-files.outputs.all_modified_files	 }}
+          echo "results<<EOF" >> "$GITHUB_OUTPUT"
+          echo "$(codeowners ${{ steps.changed-files.outputs.all_modified_files	 }})" >> "$GITHUB_OUTPUT"
+          echo "EOF" >> "$GITHUB_OUTPUT"
+      - name: Comment PR
+        uses: thollander/actions-comment-pull-request@24bffb9b452ba05a4f3f77933840a6a841d1b32b # v3.0.1
+        with:
+          file-path: resolved.txt
+          comment-tag: codeowners_resolved
+          mode: upsert
+          message: |
+            `CODEOWNERS` have been resolved as:
+
+            ```
+            ${{ steps.codeowners_resolved.outputs.results }}
+            ```

.github/workflows/run-end-to-end.yml

@@ -89,9 +89,6 @@ on:
         required: false
         type: boolean
 
-env:
-  REGISTRY: ghcr.io
-
 jobs:
   main:
     name: "${{ inputs.weblog }} ${{ inputs.weblog_instance }}"
@@ -146,9 +143,6 @@ jobs:
         scenarios: ${{ inputs.scenarios }}
         dockerhub_username: ${{ secrets.DOCKERHUB_USERNAME }}
         dockerhub_token: ${{ secrets.DOCKERHUB_TOKEN }}
-    - name: Log in to the Container registry
-      if: ${{ inputs.library == 'ruby' }}
-      run: echo ${{ secrets.GITHUB_TOKEN }} | docker login ${{ env.REGISTRY }} -u ${{ github.actor }} --password-stdin
     - name: Build weblog
       id: build
       run: SYSTEM_TEST_BUILD_ATTEMPTS=3 ./build.sh ${{ inputs.library }} -i weblog -w ${{ inputs.weblog }}
@@ -256,9 +250,6 @@ jobs:
     - name: Run REMOTE_CONFIG_MOCKED_BACKEND_ASM_FEATURES_NOCACHE scenario
       if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"REMOTE_CONFIG_MOCKED_BACKEND_ASM_FEATURES_NOCACHE"')
       run: ./run.sh REMOTE_CONFIG_MOCKED_BACKEND_ASM_FEATURES_NOCACHE
-    - name: Run REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD_NOCACHE scenario
-      if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD_NOCACHE"')
-      run: ./run.sh REMOTE_CONFIG_MOCKED_BACKEND_ASM_DD_NOCACHE
     - name: Run AGENT_SUPPORTING_SPAN_EVENTS scenario
       if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"AGENT_SUPPORTING_SPAN_EVENTS"')
       run: ./run.sh AGENT_SUPPORTING_SPAN_EVENTS
@@ -297,9 +288,6 @@ jobs:
     - name: Run APPSEC_BLOCKING_FULL_DENYLIST scenario
       if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"APPSEC_BLOCKING_FULL_DENYLIST"')
       run: ./run.sh APPSEC_BLOCKING_FULL_DENYLIST
-    - name: Run APPSEC_AND_RC_ENABLED scenario
-      if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"APPSEC_AND_RC_ENABLED"')
-      run: ./run.sh APPSEC_AND_RC_ENABLED
     - name: Run APPSEC_RUNTIME_ACTIVATION scenario
       if: always() && steps.build.outcome == 'success' && contains(inputs.scenarios, '"APPSEC_RUNTIME_ACTIVATION"')
       run: ./run.sh APPSEC_RUNTIME_ACTIVATION

.github/workflows/run-stream-processing-offload.yml

@@ -82,7 +82,6 @@ jobs:
       - name: Pull images
         uses: ./.github/actions/pull_images
         with:
-          cleanup: "false"
           library: golang
           weblog: golang-dummy
           scenarios: '["STREAM_PROCESSING_OFFLOAD", "STREAM_PROCESSING_OFFLOAD_BLOCKING"]'

.gitignore

@@ -76,3 +76,6 @@ tmp/
 
 # Go
 go.work*
+
+# Hypothesis Python package
+.hypothesis/

conftest.py

@@ -541,6 +541,13 @@ def pytest_sessionfinish(session: pytest.Session, exitstatus: int) -> None:
                     testcase.attrib["name"] = testcase.attrib["classname"] + "." + testcase.attrib["name"]
                     del testcase.attrib["classname"]
 
+                if context.weblog_variant:
+                    name = testcase.attrib["name"]
+                    if name.endswith("]"):
+                        testcase.attrib["name"] = f"{name[:-1]}, {context.weblog_variant}]"
+                    else:
+                        testcase.attrib["name"] = f"{name}[{context.weblog_variant}]"
+
             junit_report.write(session.config.option.xmlpath)
 
         try:

manifests/cpp.yml

@@ -41,6 +41,7 @@ tests/:
     test_otel_env_vars.py:
       Test_Otel_Env_Vars: missing_feature
     test_otel_logs.py: missing_feature
+    test_otel_metrics.py: missing_feature
     test_otel_span_methods.py: irrelevant (library does not implement OpenTelemetry)
     test_otel_span_with_baggage.py:
       Test_Otel_Span_With_Baggage: missing_feature

manifests/dotnet.yml

@@ -549,7 +549,7 @@ tests/:
       Test_Config_TraceEnabled: v3.3.0
       Test_Config_TraceLogDirectory: v3.3.0
       Test_Config_UnifiedServiceTagging: v3.3.0
-      Test_Stable_Config_Default: missing_feature
+      Test_Stable_Config_Default: v3.28.0
     test_crashtracking.py:
       Test_Crashtracking: v3.2.0
     test_dynamic_configuration.py:
@@ -566,6 +566,7 @@ tests/:
     test_otel_env_vars.py:
       Test_Otel_Env_Vars: v2.53.0
     test_otel_logs.py: missing_feature
+    test_otel_metrics.py: missing_feature
     test_otel_span_with_baggage.py:
       Test_Otel_Span_With_Baggage: missing_feature
     test_otel_tracer.py:
@@ -588,7 +589,7 @@ tests/:
       Test_Consistent_Configs: missing_feature
       Test_Defaults: v2.49.0
       Test_Environment: v2.49.0
-      Test_Stable_Configuration_Origin: missing_feature
+      Test_Stable_Configuration_Origin: v3.28.0
       Test_TelemetryInstallSignature: v2.45.0
       Test_TelemetrySCAEnvVar: v2.50.0
       Test_TelemetrySSIConfigs: v2.53.0