refactor(telemetry): add span component to the telemetry metrics

ddtrace/_trace/processor/__init__.py

@@ -16,6 +16,7 @@
 from ddtrace.constants import USER_KEEP
 from ddtrace.internal import gitmetadata
 from ddtrace.internal import telemetry
+from ddtrace.internal.constants import COMPONENT
 from ddtrace.internal.constants import HIGHER_ORDER_TRACE_ID_BITS
 from ddtrace.internal.constants import LAST_DD_PARENT_ID_KEY
 from ddtrace.internal.constants import MAX_UINT_64BITS
@@ -315,12 +316,15 @@ def on_span_start(self, span: Span) -> None:
         with self._lock:
             trace = self._traces[span.trace_id]
             trace.spans.append(span)
-            self._span_metrics["spans_created"][span._span_api] += 1
+            integration_name = span._meta.get(COMPONENT, span._span_api)
+
+            self._span_metrics["spans_created"][integration_name] += 1
             self._queue_span_count_metrics("spans_created", "integration_name")
 
     def on_span_finish(self, span: Span) -> None:
         with self._lock:
-            self._span_metrics["spans_finished"][span._span_api] += 1
+            integration_name = span._meta.get(COMPONENT, span._span_api)
+            self._span_metrics["spans_finished"][integration_name] += 1
 
             # Calling finish on a span that we did not see the start for
             # DEV: This can occur if the SpanAggregator is recreated while there is a span in progress

tests/telemetry/test_telemetry_metrics_e2e.py

@@ -89,14 +89,16 @@ def test_span_creation_and_finished_metrics_datadog(test_agent_session, ddtrace_
     code = """
 from ddtrace.trace import tracer
 for _ in range(10):
-    with tracer.trace('span1'):
+    with tracer.trace('span1') as span:
+        span.set_tag("component", "custom")
         pass
 """
     env = os.environ.copy()
     env["_DD_INSTRUMENTATION_TELEMETRY_TESTS_FORCE_APP_STARTED"] = "true"
     _, stderr, status, _ = ddtrace_run_python_code_in_subprocess(code, env=env)
     assert status == 0, stderr
     metrics_sc = test_agent_session.get_metrics("spans_created")
+
     assert len(metrics_sc) == 1
     assert metrics_sc[0]["metric"] == "spans_created"
     assert metrics_sc[0]["tags"] == ["integration_name:datadog"]
@@ -105,7 +107,7 @@ def test_span_creation_and_finished_metrics_datadog(test_agent_session, ddtrace_
     metrics_sf = test_agent_session.get_metrics("spans_finished")
     assert len(metrics_sf) == 1
     assert metrics_sf[0]["metric"] == "spans_finished"
-    assert metrics_sf[0]["tags"] == ["integration_name:datadog"]
+    assert metrics_sf[0]["tags"] == ["integration_name:custom"]
     assert metrics_sf[0]["points"][0][1] == 10
 
 

tests/tracer/test_processors.py

@@ -342,6 +342,7 @@ def test_span_creation_metrics():
 
             span = Span("span", on_finish=[aggr.on_span_finish])
             aggr.on_span_start(span)
+            span.set_tag("component", "custom")
             span.finish()
 
             mock_tm.assert_has_calls(
@@ -368,12 +369,11 @@ def test_span_creation_metrics():
             )
             mock_tm.reset_mock()
             aggr.shutdown(None)
+            # On span finished the span has a different integration name:
             mock_tm.assert_has_calls(
                 [
                     mock.call(TELEMETRY_NAMESPACE.TRACERS, "spans_created", 1, tags=(("integration_name", "datadog"),)),
-                    mock.call(
-                        TELEMETRY_NAMESPACE.TRACERS, "spans_finished", 1, tags=(("integration_name", "datadog"),)
-                    ),
+                    mock.call(TELEMETRY_NAMESPACE.TRACERS, "spans_finished", 1, tags=(("integration_name", "custom"),)),
                 ]
             )