diff --git a/manifests/cpp.yml b/manifests/cpp.yml index ac5936f927d..1f2f785cb4f 100644 --- a/manifests/cpp.yml +++ b/manifests/cpp.yml @@ -72,4 +72,4 @@ manifest: tests/parametric/test_telemetry.py::Test_TelemetrySSIConfigs: missing_feature tests/parametric/test_tracer.py::Test_TracerSCITagging: missing_feature tests/parametric/test_tracer_flare.py: 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 b1f639be433..e95abb084e2 100644 --- a/manifests/cpp_httpd.yml +++ b/manifests/cpp_httpd.yml @@ -92,6 +92,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 721f7a12182..942a8c3aabb 100644 --- a/manifests/cpp_nginx.yml +++ b/manifests/cpp_nginx.yml @@ -250,7 +250,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): 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],