diff --git a/manifests/cpp.yml b/manifests/cpp.yml index ca73d6d846a..3c48946ba3a 100644 --- a/manifests/cpp.yml +++ b/manifests/cpp.yml @@ -287,8 +287,7 @@ manifest: tests/parametric/test_tracer.py::Test_Tracer::test_tracer_span_top_level_attributes: missing_feature (metrics cannot be set manually) tests/parametric/test_tracer.py::Test_TracerBaseService: missing_feature (_dd.base_service is not implemented) tests/parametric/test_tracer.py::Test_TracerSCITagging: missing_feature - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py: '>=2.0.0' # Modified by easy win activation script tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_flare_log_level_order: missing_feature # Created by easy win activation script diff --git a/manifests/cpp_httpd.yml b/manifests/cpp_httpd.yml index 8d7c6ba1fd5..0459c2e20f1 100644 --- a/manifests/cpp_httpd.yml +++ b/manifests/cpp_httpd.yml @@ -84,8 +84,7 @@ manifest: tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature tests/parametric/test_tracer.py::Test_TracerBaseService: missing_feature (_dd.base_service is not implemented) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/remote_config/test_remote_configuration.py::Test_RemoteConfigurationExtraServices: missing_feature tests/remote_config/test_remote_configuration.py::Test_RemoteConfigurationUpdateSequenceASMDD: missing_feature diff --git a/manifests/cpp_nginx.yml b/manifests/cpp_nginx.yml index 536dde96fc2..a2f44aed522 100644 --- a/manifests/cpp_nginx.yml +++ b/manifests/cpp_nginx.yml @@ -306,8 +306,7 @@ manifest: tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature tests/parametric/test_tracer.py::Test_TracerBaseService: missing_feature (_dd.base_service is not implemented) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/remote_config/test_remote_configuration.py::Test_RemoteConfigurationExtraServices: missing_feature tests/remote_config/test_remote_configuration.py::Test_RemoteConfigurationUpdateSequenceASMDD: v1.3.0 diff --git a/manifests/dotnet.yml b/manifests/dotnet.yml index e49fb25082f..519a4ba7fdf 100644 --- a/manifests/dotnet.yml +++ b/manifests/dotnet.yml @@ -1014,6 +1014,7 @@ manifest: tests/parametric/test_tracer.py::Test_TracerSCITagging: v2.48.0 tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: v3.40.0 tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: v3.40.0 + tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_srv_src_inherited_on_child_span: bug (APMLP-1227) tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: v2.48.0 tests/remote_config/test_remote_configuration.py::Test_RemoteConfigurationExtraServices: v2.36.0 diff --git a/manifests/golang.yml b/manifests/golang.yml index 6fb9dc15273..ef3b8618aa9 100644 --- a/manifests/golang.yml +++ b/manifests/golang.yml @@ -1203,6 +1203,7 @@ manifest: tests/parametric/test_tracer.py::Test_TracerSCITagging: v1.48.0 tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: '>=2.7.0-dev.1' + tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_srv_src_inherited_on_child_span: v2.9.0-dev tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: '>=2.5.0' # Modified by easy win activation script tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_flare_log_level_order: missing_feature # Created by easy win activation script diff --git a/manifests/java_otel.yml b/manifests/java_otel.yml index 473c59f47a0..6781d428f75 100644 --- a/manifests/java_otel.yml +++ b/manifests/java_otel.yml @@ -54,8 +54,7 @@ manifest: tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_keep_span_with_stats_computation_sss010: missing_feature (this has to be implemented by a lot of the tracers and we need to do a bit of work on the assert) tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java) tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet) diff --git a/manifests/nodejs.yml b/manifests/nodejs.yml index 13a553b27e5..9f18925f229 100644 --- a/manifests/nodejs.yml +++ b/manifests/nodejs.yml @@ -2127,8 +2127,7 @@ manifest: tests/parametric/test_tracer.py::Test_Tracer::test_tracer_span_top_level_attributes: missing_feature (nodejs overrides the manually set service name) tests/parametric/test_tracer.py::Test_TracerSCITagging: *ref_3_21_0 tests/parametric/test_tracer.py::Test_TracerSCITagging::test_tracer_repository_url_strip_credentials: missing_feature (nodejs does not strip credentials yet) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: *ref_5_15_0 tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_tracer_flare: missing_feature (Only plaintext files are sent presently) diff --git a/manifests/nodejs_otel.yml b/manifests/nodejs_otel.yml index 1c244f76a3f..b2d8ff68919 100644 --- a/manifests/nodejs_otel.yml +++ b/manifests/nodejs_otel.yml @@ -71,8 +71,7 @@ manifest: tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_keep_span_with_stats_computation_sss010: missing_feature (this has to be implemented by a lot of the tracers and we need to do a bit of work on the assert) tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java) tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet) diff --git a/manifests/php.yml b/manifests/php.yml index 7d80cea05af..fcae3ea3a44 100644 --- a/manifests/php.yml +++ b/manifests/php.yml @@ -859,8 +859,7 @@ manifest: tests/parametric/test_trace_sampling.py::Test_Trace_Sampling_With_W3C: missing_feature tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature tests/parametric/test_tracer.py::Test_TracerSCITagging: v1.2.0 - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: missing_feature tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_flare_log_level_order: '>=1.16.0' diff --git a/manifests/python.yml b/manifests/python.yml index e0e054a183b..9639efede57 100644 --- a/manifests/python.yml +++ b/manifests/python.yml @@ -1797,8 +1797,7 @@ manifest: tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: v4.7.0 tests/parametric/test_tracer.py::Test_Tracer: v2.8.0 tests/parametric/test_tracer.py::Test_TracerSCITagging: v1.12.0 - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging: v0.36.0 tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: v3.12.0.dev diff --git a/manifests/python_lambda.yml b/manifests/python_lambda.yml index f7f43cfe4fb..a5134f271ec 100644 --- a/manifests/python_lambda.yml +++ b/manifests/python_lambda.yml @@ -317,8 +317,7 @@ manifest: tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_keep_span_with_stats_computation_sss010: missing_feature (this has to be implemented by a lot of the tracers and we need to do a bit of work on the assert) tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java) tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet) diff --git a/manifests/python_otel.yml b/manifests/python_otel.yml index c328e8caccb..7492efeaafb 100644 --- a/manifests/python_otel.yml +++ b/manifests/python_otel.yml @@ -64,8 +64,7 @@ manifest: tests/parametric/test_span_sampling.py::Test_Span_Sampling::test_keep_span_with_stats_computation_sss010: missing_feature (this has to be implemented by a lot of the tracers and we need to do a bit of work on the assert) tests/parametric/test_telemetry.py::Test_TelemetrySCAEnvVar::test_telemetry_sca_enabled_propagated_specifics: irrelevant tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/stats/test_stats.py::Test_Stats_Service_Source: irrelevant (Only implemented for Java) tests/test_library_conf.py::Test_HeaderTags_DynamicConfig::test_tracing_client_http_header_tags_apm_multiconfig: missing_feature (APM_TRACING_MULTICONFIG is not supported in any language yet) diff --git a/manifests/ruby.yml b/manifests/ruby.yml index db08f4c4cab..54684f8788a 100644 --- a/manifests/ruby.yml +++ b/manifests/ruby.yml @@ -1554,8 +1554,7 @@ manifest: tests/parametric/test_tracer.py::Test_ProcessTags_ServiceName: missing_feature tests/parametric/test_tracer.py::Test_TracerBaseService: missing_feature (_dd.base_service is not implemented) tests/parametric/test_tracer.py::Test_TracerSCITagging: v1.21.0 - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: '>=2.27.0' # Modified by easy win activation script tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_flare_log_level_order: missing_feature # Created by easy win activation script diff --git a/manifests/rust.yml b/manifests/rust.yml index 1712885a96f..3d55c8280aa 100644 --- a/manifests/rust.yml +++ b/manifests/rust.yml @@ -292,8 +292,7 @@ manifest: tests/parametric/test_tracer.py::Test_Tracer: missing_feature # Created by easy win activation script tests/parametric/test_tracer.py::Test_TracerBaseService: missing_feature (_dd.base_service is not implemented) tests/parametric/test_tracer.py::Test_TracerSCITagging: missing_feature # Created by easy win activation script - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_manual_service_name_sets_srv_src: irrelevant (Only implemented for Java) - tests/parametric/test_tracer.py::Test_TracerServiceNameSource::test_tracer_no_srv_src_when_service_not_manually_set: irrelevant (Only implemented for Java) + tests/parametric/test_tracer.py::Test_TracerServiceNameSource: irrelevant tests/parametric/test_tracer.py::Test_TracerUniversalServiceTagging::test_tracer_service_name_environment_variable: "missing_feature (FIXME: library test client sets empty string as the service name)" tests/parametric/test_tracer_flare.py::TestTracerFlareV1: '>=0.2.1' # Modified by easy win activation script tests/parametric/test_tracer_flare.py::TestTracerFlareV1::test_flare_log_level_order: missing_feature # Created by easy win activation script diff --git a/tests/parametric/test_tracer.py b/tests/parametric/test_tracer.py index 7e8834f8b77..21be477630c 100644 --- a/tests/parametric/test_tracer.py +++ b/tests/parametric/test_tracer.py @@ -233,6 +233,25 @@ def test_tracer_no_srv_src_when_service_not_manually_set( assert root_span is not None, "Root span not found" assert "_dd.svc_src" not in root_span.get("meta", {}) + def test_tracer_srv_src_inherited_on_child_span(self, test_agent: TestAgentAPI, test_library: APMLibrary) -> None: + """When a parent span has a manually set service name + A child span that inherits the same service should also have _dd.svc_src set to "m" + """ + with ( + test_library, + test_library.dd_start_span("parent", service="my-service") as parent, + test_library.dd_start_span("child", parent_id=parent.span_id), + ): + pass + + traces = test_agent.wait_for_num_traces(1, sort_by_start=False) + trace = find_trace(traces, parent.trace_id) + + child_span = next(s for s in trace if s["name"] == "child") + assert child_span["meta"].get("_dd.svc_src") == "m", ( + f"Expected _dd.svc_src='m' on child span, got: {child_span['meta'].get('_dd.svc_src')!r}" + ) + @scenarios.parametric @features.base_service