diff --git a/manifests/cpp.yml b/manifests/cpp.yml index 5a8762cde0..0b81c121da 100644 --- a/manifests/cpp.yml +++ b/manifests/cpp.yml @@ -175,6 +175,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_distributed.py: Test_DistributedHttp: missing_feature test_identify.py: irrelevant diff --git a/manifests/dotnet.yml b/manifests/dotnet.yml index d41206e437..737b6682ce 100644 --- a/manifests/dotnet.yml +++ b/manifests/dotnet.yml @@ -371,6 +371,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_data_integrity.py: Test_LibraryHeaders: v2.46.0 test_distributed.py: diff --git a/manifests/golang.yml b/manifests/golang.yml index fd91157a8e..aed61265ea 100644 --- a/manifests/golang.yml +++ b/manifests/golang.yml @@ -491,6 +491,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: v1.67.0 Test_Config_ObfuscationQueryStringRegexp_Empty: v1.67.0 + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_data_integrity.py: Test_LibraryHeaders: v1.60.0.dev0 test_distributed.py: diff --git a/manifests/java.yml b/manifests/java.yml index 715636148c..ea3d2ceecf 100644 --- a/manifests/java.yml +++ b/manifests/java.yml @@ -1241,6 +1241,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: v1.39.0 Test_Config_ObfuscationQueryStringRegexp_Empty: v1.39.0 + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_data_integrity.py: Test_LibraryHeaders: v1.29.0 test_distributed.py: diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 5e0e0e0c8f..c322d9b891 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -566,6 +566,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_distributed.py: Test_DistributedHttp: missing_feature test_identify.py: diff --git a/manifests/php.yml b/manifests/php.yml index 400b5b55a2..e3dd8e7412 100644 --- a/manifests/php.yml +++ b/manifests/php.yml @@ -322,6 +322,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_distributed.py: Test_DistributedHttp: missing_feature test_identify.py: diff --git a/manifests/python.yml b/manifests/python.yml index 672346b794..a0ad0323a7 100644 --- a/manifests/python.yml +++ b/manifests/python.yml @@ -764,6 +764,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_data_integrity.py: Test_LibraryHeaders: v2.7.0 test_distributed.py: diff --git a/manifests/ruby.yml b/manifests/ruby.yml index 62768169ea..0f07428b97 100644 --- a/manifests/ruby.yml +++ b/manifests/ruby.yml @@ -392,6 +392,8 @@ tests/: Test_Config_HttpServerErrorStatuses_FeatureFlagCustom: missing_feature Test_Config_ObfuscationQueryStringRegexp_Configured: missing_feature Test_Config_ObfuscationQueryStringRegexp_Empty: missing_feature + Test_Config_UnifiedServiceTagging_CustomService: missing_feature + Test_Config_UnifiedServiceTagging_Default: missing_feature test_distributed.py: Test_DistributedHttp: missing_feature test_identify.py: diff --git a/tests/test_config_consistency.py b/tests/test_config_consistency.py index cec754eda9..322d5b003e 100644 --- a/tests/test_config_consistency.py +++ b/tests/test_config_consistency.py @@ -136,3 +136,35 @@ def _get_span_by_tags(trace, tags): break else: return span + + +@scenarios.tracing_config_nondefault +@features.tracing_configuration_consistency +class Test_Config_UnifiedServiceTagging_CustomService: + """ Verify behavior of http clients and distributed traces """ + + def setup_specified_service_name(self): + self.r = weblog.get("/") + + def test_specified_service_name(self): + interfaces.library.assert_trace_exists(self.r) + spans = interfaces.agent.get_spans_list(self.r) + assert len(spans) == 1, "Agent received the incorrect amount of spans" + assert spans[0]["service"] == "service_test" + + +@scenarios.default +@features.tracing_configuration_consistency +class Test_Config_UnifiedServiceTagging_Default: + """ Verify behavior of http clients and distributed traces """ + + def setup_default_service_name(self): + self.r = weblog.get("/") + + def test_default_service_name(self): + interfaces.library.assert_trace_exists(self.r) + spans = interfaces.agent.get_spans_list(self.r) + assert len(spans) == 1, "Agent received the incorrect amount of spans" + assert ( + spans[0]["service"] != "service_test" + ) # in default scenario, DD_SERVICE is set to "weblog" in the dockerfile; this is a temp fix to test that it is not the value we manually set in the specific scenario diff --git a/utils/_context/_scenarios/__init__.py b/utils/_context/_scenarios/__init__.py index 32d9a6fc76..1022da2c65 100644 --- a/utils/_context/_scenarios/__init__.py +++ b/utils/_context/_scenarios/__init__.py @@ -447,6 +447,7 @@ def all_endtoend_scenarios(test_object): weblog_env={ "DD_TRACE_HTTP_SERVER_ERROR_STATUSES": "200-201,202", "DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP": "ssn=\d{3}-\d{2}-\d{4}", + "DD_SERVICE": "service_test", }, doc="", scenario_groups=[ScenarioGroup.ESSENTIALS],