fix: avoid using svc_src: m when service is among active integration defaults

ddtrace/_trace/tracer.py

@@ -510,9 +510,12 @@ def start_span(
                 service = parent.service
                 service_source = parent.get_tag(_SERVICE_SOURCE) or ""
             else:
-                service = service_source = config.service
+                service = config.service
         else:
-            service_source = "m"
+            if service in config._integration_default_services:
+                service_source = service
+            else:
+                service_source = "m"
 
         # Update the service name based on any mapping
         if service is not None:

ddtrace/contrib/internal/trace_utils.py

@@ -400,14 +400,13 @@ def set_service_and_source(
         span.set_tag(_SERVICE_SOURCE, "opt.split_by_domain")
     # NB "not service" here makes svc_src make sense in cases of service inheritance
     elif not service or service == int_config.get(default_service_key):
-        span.set_tag(
-            _SERVICE_SOURCE,
-            getattr(
-                int_config,
-                "integration_name",
-                int_config.get("integration_name", "m") if hasattr(int_config, "get") else "m",
-            ),
+        service_source = getattr(
+            int_config,
+            "integration_name",
+            int_config.get("integration_name", "") if hasattr(int_config, "get") else "",
         )
+        if service_source:
+            span.set_tag(_SERVICE_SOURCE, service_source)
     if service:
         span.service = service
 

ddtrace/internal/settings/_config.py

@@ -48,6 +48,7 @@
 log = get_logger(__name__)
 
 ENDPOINT_FETCHED_CONFIG = fetch_config_from_endpoint()
+DEFAULT_SERVICE_KEYS = frozenset(["_default_service", "_default_service_worker", "_default_service_producer"])
 
 DD_TRACE_OBFUSCATION_QUERY_STRING_REGEXP_DEFAULT = (
     r"(?ix)"
@@ -209,6 +210,14 @@
 )
 
 
+def _integration_default_service_names_from_config(int_config: IntegrationConfig) -> set[str]:
+    names: set[str] = set()
+    for attribute in DEFAULT_SERVICE_KEYS:
+        if value := int_config.get(attribute):
+            names.add(value)
+    return names
+
+
 def _parse_propagation_styles(styles_str: str) -> Optional[list[str]]:
     """Helper to parse http propagation extract/inject styles via env variables.
 
@@ -447,6 +456,8 @@ def __init__(self) -> None:
 
         # Use a dict as underlying storing mechanism for integration configs
         self._integration_configs: dict[str, IntegrationConfig] = {}
+        # Union of `_default_service*` string values from integrations registered via `_add`.
+        self._integration_default_services: frozenset[str] = frozenset()
 
         self._debug_mode = _get_config("DD_TRACE_DEBUG", False, asbool, "OTEL_LOG_LEVEL")
         self._startup_logs_enabled = _get_config("DD_TRACE_STARTUP_LOGS", False, asbool)
@@ -772,6 +783,12 @@ def _get_extra_services(self) -> set[str]:
             self._extra_services.pop()
         return self._extra_services
 
+    def _recompute_integration_default_services(self) -> None:
+        names: set[str] = set()
+        for int_conf in self._integration_configs.values():
+            names.update(_integration_default_service_names_from_config(int_conf))
+        self._integration_default_services = frozenset(names)
+
     def _add(self, integration, settings, merge=True):
         """Internal API that registers an integration with given default
         settings.
@@ -809,6 +826,8 @@ def _add(self, integration, settings, merge=True):
         else:
             self._integration_configs[integration] = IntegrationConfig(self, integration, settings)
 
+        self._recompute_integration_default_services()
+
     @cachedmethod()
     def _header_tag_name(self, header_name: str) -> Optional[str]:
         return self._http._header_tag_name(header_name)

releasenotes/notes/svc-src-multi-defaults-8fc529fc93537b0a.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    tracing: This change fixes an issue in which `svc_src` is set to `m` in cases where `service` matches the `_default_service` of an active integration config.
+    In such cases, the intended behavior is that it `svc_src` is equal to `service`. #17712

tests/contrib/azure_cosmos/test_azure_cosmos_snapshot.py

@@ -11,7 +11,7 @@
 CONNECTION_STRING = "AccountEndpoint=http://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==;"
 ERR_DB_NAME = "db.azure_cosmos_error"
 ERR_CONTAINER_NAME = "container.azure_cosmos_error"
-SNAPSHOT_IGNORES = ["meta.http.useragent", "meta.error.stack"]
+SNAPSHOT_IGNORES = ["meta.http.useragent", "meta.error.stack", "meta._dd.base_service"]
 
 DEFAULT_HEADERS = {"User-Agent": "python-httpx/x.xx.x"}
 

tests/contrib/azure_functions_cosmos/test_azure_functions_snapshot.py

@@ -10,7 +10,7 @@
 from tests.webclient import Client
 
 
-SNAPSHOT_IGNORES = ["meta.http.useragent", "meta.http.status_code"]
+SNAPSHOT_IGNORES = ["meta.http.useragent", "meta.http.status_code", "meta._dd.base_service"]
 DEFAULT_HEADERS = {"User-Agent": "python-httpx/x.xx.x"}
 
 CONNECTION_STRING = "AccountEndpoint=http://localhost:8081/;AccountKey=C2y6yDjf5/R+ob0N8A7Cgv30VRDJIWEHLM+4QDU5DE2nQ9nDuVTqobD4b8mGGyPMbIZnqyMsEcaGQy67XIw/Jw==;"

tests/contrib/django/test_django.py

@@ -1636,7 +1636,7 @@ def test_cached_view():
         assert span_header.error == 0
 
         expected_meta_view = {
-            "_dd.svc_src": "m",
+            "_dd.svc_src": "django",
             "component": "django",
             "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
             "django.cache.key": (
@@ -1646,7 +1646,7 @@ def test_cached_view():
         }
 
         expected_meta_header = {
-            "_dd.svc_src": "m",
+            "_dd.svc_src": "django",
             "component": "django",
             "django.cache.backend": "django.core.cache.backends.locmem.LocMemCache",
             "django.cache.key": "views.decorators.cache.cache_header..03cdc1cc4aab71b038a6764e5fcabb82.en-us",

tests/contrib/flask/test_blueprint.py

@@ -47,5 +47,5 @@ def test():
         self.assertEqual(span.resource, "/")
         self.assertNotEqual(span.parent_id, 0)
         self.assertEqual(
-            span.get_tags(), {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "m"}
+            span.get_tags(), {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "flask"}
         )

tests/contrib/flask/test_errorhandler.py

@@ -6,7 +6,7 @@
 from . import BaseFlaskTestCase
 
 
-EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "m"}
+EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "flask"}
 
 
 class FlaskErrorhandlerTestCase(BaseFlaskTestCase):

tests/contrib/flask/test_flask_helpers.py

@@ -54,7 +54,6 @@ def test_jsonify(self):
         assert set(spans[0].get_tags().keys()) == {
             "runtime-id",
             "_dd.p.dm",
-            "_dd.svc_src",
             "_dd.p.tid",
             "component",
             "language",

tests/contrib/flask/test_views.py

@@ -10,7 +10,7 @@
 
 base_exception_name = "builtins.Exception"
 
-EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "m"}
+EXPECTED_METADATA = {"component": "flask", "_dd.base_service": "tests.contrib.flask", "_dd.svc_src": "flask"}
 
 
 class FlaskViewTestCase(BaseFlaskTestCase):

tests/contrib/sqlite3/test_sqlite3.py

@@ -212,6 +212,7 @@ def test_rollback(self):
             dict(name="sqlite.connection.rollback", service="sqlite"),
         )
 
+    @pytest.mark.snapshot()
     def test_patch_unpatch(self):
         # Test patch idempotence
         patch()

tests/contrib/suitespec.yml

@@ -1231,6 +1231,7 @@ suites:
       - tests/contrib/futures/*
       - tests/contrib/dbapi/*
       - tests/contrib/dbapi_async/*
+      - tests/snapshots/tests.contrib.sqlite3*
     pattern: asyncio$|sqlite3$|futures$|dbapi$|dbapi_async$
     snapshot: true
   structlog:

tests/snapshots/test_selenium_chrome.test_selenium_chrome_pytest_rum_disabled.json

@@ -13,7 +13,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f30a500000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -56,7 +56,7 @@
          "_dd.origin": "ciapp-test",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "674f30a500000000",
-         "_dd.svc_src": "m",
+         "_dd.svc_src": "pytest",
          "component": "pytest",
          "language": "python",
          "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -100,7 +100,7 @@
             "_dd.origin": "ciapp-test",
             "_dd.p.dm": "-0",
             "_dd.p.tid": "674f30a500000000",
-            "_dd.svc_src": "m",
+            "_dd.svc_src": "pytest",
             "component": "pytest",
             "language": "python",
             "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -145,7 +145,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f30a500000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",

tests/snapshots/test_selenium_chrome.test_selenium_chrome_pytest_rum_enabled.json

@@ -13,7 +13,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f30a200000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -56,7 +56,7 @@
          "_dd.origin": "ciapp-test",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "674f30a200000000",
-         "_dd.svc_src": "m",
+         "_dd.svc_src": "pytest",
          "component": "pytest",
          "language": "python",
          "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -100,7 +100,7 @@
             "_dd.origin": "ciapp-test",
             "_dd.p.dm": "-0",
             "_dd.p.tid": "674f30a200000000",
-            "_dd.svc_src": "m",
+            "_dd.svc_src": "pytest",
             "component": "pytest",
             "language": "python",
             "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -145,7 +145,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f30a300000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",

tests/snapshots/test_selenium_chrome.test_selenium_chrome_pytest_unpatch_does_not_record_selenium_tags.json

@@ -13,7 +13,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f2f1000000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -56,7 +56,7 @@
          "_dd.origin": "ciapp-test",
          "_dd.p.dm": "-0",
          "_dd.p.tid": "674f2f1000000000",
-         "_dd.svc_src": "m",
+         "_dd.svc_src": "pytest",
          "component": "pytest",
          "language": "python",
          "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -100,7 +100,7 @@
             "_dd.origin": "ciapp-test",
             "_dd.p.dm": "-0",
             "_dd.p.tid": "674f2f1000000000",
-            "_dd.svc_src": "m",
+            "_dd.svc_src": "pytest",
             "component": "pytest",
             "language": "python",
             "library_version": "2.18.0.dev95+g5f76e34a0",
@@ -145,7 +145,7 @@
       "_dd.origin": "ciapp-test",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "674f2f1000000000",
-      "_dd.svc_src": "m",
+      "_dd.svc_src": "pytest",
       "component": "pytest",
       "language": "python",
       "library_version": "2.18.0.dev95+g5f76e34a0",

tests/snapshots/tests.contrib.aiohttp.test_aiohttp_client.test_trace_parenting.json

@@ -10,20 +10,19 @@
     "error": 0,
     "meta": {
       "_dd.p.dm": "-0",
-      "_dd.p.tid": "69de729100000000",
-      "_dd.svc_src": "tests.contrib.aiohttp",
+      "_dd.p.tid": "69f397aa00000000",
       "_dd.tags.process": "entrypoint.name:pytest,entrypoint.type:script,entrypoint.workdir:project,svc.auto:tests.contrib.aiohttp",
       "language": "python",
-      "runtime-id": "ee9feda0416e4d809184aae62cb36e25"
+      "runtime-id": "02ac7b2b4d9f4a509c05893fdb3651c0"
     },
     "metrics": {
       "_dd.top_level": 1.0,
       "_dd.tracer_kr": 1.0,
       "_sampling_priority_v1": 1.0,
-      "process_id": 12658.0
+      "process_id": 48434.0
     },
-    "duration": 2863167,
-    "start": 1776186001600195211
+    "duration": 6572167,
+    "start": 1777571754702670420
   },
      {
        "name": "aiohttp.request",
@@ -44,8 +43,8 @@
          "out.host": "localhost",
          "span.kind": "client"
        },
-       "duration": 2523208,
-       "start": 1776186001600402295
+       "duration": 4833417,
+       "start": 1777571754704098045
      },
         {
           "name": "TCPConnector.connect",
@@ -57,10 +56,10 @@
           "type": "",
           "error": 0,
           "meta": {
-            "_dd.p.tid": "69de729100000000",
+            "_dd.p.tid": "69f397aa00000000",
             "_dd.svc_src": "aiohttp_client",
             "component": "aiohttp"
           },
-          "duration": 1111458,
-          "start": 1776186001600777795
+          "duration": 2235458,
+          "start": 1777571754705389754
         }]]

tests/snapshots/tests.contrib.aiohttp_jinja2.test_aiohttp_jinja2.test_template_rendering_snapshot.json

@@ -11,7 +11,6 @@
     "meta": {
       "_dd.p.dm": "-0",
       "_dd.p.tid": "69de72c200000000",
-      "_dd.svc_src": "tests.contrib.aiohttp_jinja2",
       "_dd.tags.process": "entrypoint.name:pytest,entrypoint.type:script,entrypoint.workdir:project,svc.auto:tests.contrib.aiohttp_jinja2",
       "aiohttp.template": "/template.jinja2",
       "component": "aiohttp_jinja2",

tests/snapshots/tests.contrib.asyncpg.test_asyncpg.test_configure_service_name_env_v0.json

@@ -12,7 +12,6 @@
       "_dd.base_service": "ddtrace_subprocess_dir",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "69e127ce00000000",
-      "_dd.svc_src": "ddtrace_subprocess_dir",
       "_dd.tags.process": "entrypoint.basedir:ddtrace_subprocess_dir,entrypoint.name:test,entrypoint.type:script,entrypoint.workdir:project,svc.auto:ddtrace_subprocess_dir",
       "component": "asyncpg",
       "db.name": "postgres",
@@ -48,7 +47,6 @@
       "_dd.base_service": "ddtrace_subprocess_dir",
       "_dd.p.dm": "-0",
       "_dd.p.tid": "69e127ce00000000",
-      "_dd.svc_src": "ddtrace_subprocess_dir",
       "_dd.tags.process": "entrypoint.basedir:ddtrace_subprocess_dir,entrypoint.name:test,entrypoint.type:script,entrypoint.workdir:project,svc.auto:ddtrace_subprocess_dir",
       "component": "asyncpg",
       "db.name": "postgres",

tests/snapshots/tests.contrib.asyncpg.test_asyncpg.test_configure_service_name_env_v1.json

@@ -13,7 +13,6 @@
       "_dd.p.dm": "-0",
       "_dd.p.tid": "69e127ce00000000",
       "_dd.peer.service.source": "db.name",
-      "_dd.svc_src": "ddtrace_subprocess_dir",
       "_dd.tags.process": "entrypoint.basedir:ddtrace_subprocess_dir,entrypoint.name:test,entrypoint.type:script,entrypoint.workdir:project,svc.auto:ddtrace_subprocess_dir",
       "component": "asyncpg",
       "db.name": "postgres",
@@ -51,7 +50,6 @@
       "_dd.p.dm": "-0",
       "_dd.p.tid": "69e127ce00000000",
       "_dd.peer.service.source": "db.name",
-      "_dd.svc_src": "ddtrace_subprocess_dir",
       "_dd.tags.process": "entrypoint.basedir:ddtrace_subprocess_dir,entrypoint.name:test,entrypoint.type:script,entrypoint.workdir:project,svc.auto:ddtrace_subprocess_dir",
       "component": "asyncpg",
       "db.name": "postgres",