From 85a9b1e3a9fbf412f67f3f9cc1a4878543f62040 Mon Sep 17 00:00:00 2001 From: Anna Date: Thu, 18 Dec 2025 18:00:14 +0100 Subject: [PATCH 1/2] add changes --- manifests/cpp.yml | 2 +- manifests/cpp_httpd.yml | 2 +- manifests/cpp_nginx.yml | 2 +- tests/test_telemetry.py | 8 ++++++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/manifests/cpp.yml b/manifests/cpp.yml index cda3460d98b..0a02979d4fe 100644 --- a/manifests/cpp.yml +++ b/manifests/cpp.yml @@ -75,4 +75,4 @@ manifest: tests/test_feature_flag_exposures.py::Test_FFE_Exposure_Events_Errors: missing_feature tests/test_feature_flag_exposures.py::Test_FFE_RC_Down_From_Start: missing_feature tests/test_feature_flag_exposures.py::Test_FFE_RC_Unavailable: missing_feature - tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: missing_feature + tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: ">2.0.0" diff --git a/manifests/cpp_httpd.yml b/manifests/cpp_httpd.yml index 52efe20157e..f97856727ca 100644 --- a/manifests/cpp_httpd.yml +++ b/manifests/cpp_httpd.yml @@ -95,6 +95,6 @@ manifest: tests/test_telemetry.py::Test_MessageBatch: missing_feature tests/test_telemetry.py::Test_Metric_Generation_Enabled: missing_feature tests/test_telemetry.py::Test_ProductsDisabled: irrelevant - tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: missing_feature + tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: ">2.0.0" tests/test_telemetry.py::Test_TelemetrySCAEnvVar: missing_feature tests/test_v1_payloads.py: missing_feature diff --git a/manifests/cpp_nginx.yml b/manifests/cpp_nginx.yml index a0b2075b8fb..6665738ec1b 100644 --- a/manifests/cpp_nginx.yml +++ b/manifests/cpp_nginx.yml @@ -253,7 +253,7 @@ manifest: tests/test_telemetry.py::Test_Metric_Generation_Enabled: missing_feature tests/test_telemetry.py::Test_ProductsDisabled: irrelevant tests/test_telemetry.py::Test_Telemetry: missing_feature - tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: missing_feature + tests/test_telemetry.py::Test_TelemetryEnhancedConfigReporting: ">2.0.0" tests/test_telemetry.py::Test_TelemetrySCAEnvVar: missing_feature tests/test_telemetry.py::Test_TelemetryV2: missing_feature tests/test_v1_payloads.py: missing_feature diff --git a/tests/test_telemetry.py b/tests/test_telemetry.py index 2f235270e90..106e6e24c65 100644 --- a/tests/test_telemetry.py +++ b/tests/test_telemetry.py @@ -633,6 +633,14 @@ class Test_TelemetryEnhancedConfigReporting: {"origin": "env_var", "value": "false"}, ], }, + "cpp": { + "name": "DD_SERVICE", + "precedence": [ + {"origin": "default", "value": "parametric-http-server"}, + {"origin": "env_var", "value": "my-service-env-var"}, + {"origin": "code", "value": "service-set-from-code"}, + ], + }, } def test_telemetry_events_seq_id(self): From 490ef7035b7f276a30c811ef16957776cbd1534a Mon Sep 17 00:00:00 2001 From: Anna Date: Mon, 22 Dec 2025 14:39:47 +0100 Subject: [PATCH 2/2] add service env var for cpp tracer --- utils/_context/_scenarios/__init__.py | 1 + 1 file changed, 1 insertion(+) diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py index b35e55543db..55ce1e8233f 100644 --- a/utils/_context/_scenarios/__init__.py +++ b/utils/_context/_scenarios/__init__.py @@ -131,6 +131,7 @@ class _Scenarios: "DD_LOGS_INJECTION": "false", "CONFIG_CHAINING_TEST": "true", "DD_TRACE_CONFIG": "/app/ConfigChaining.properties", + "DD_SERVICE": "my-service-env-var", }, doc="Test telemetry for environment variable configurations", scenario_groups=[scenario_groups.telemetry],