build(native): isolate libdatadog v41 upgrade

Author: mabdinur

.github/workflows/system-tests.yml

@@ -95,11 +95,11 @@ jobs:
   serverless-system-tests:
     needs: [serverless-system-tests-build-layer]
     # Automatically managed, use scripts/update-system-tests-version to update
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@17a45f60c216a142ced110eb15f63a4acc2a0b4a
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@692e9462ef7296cf1224c0d2bd3a3623a1bfe590
     secrets: inherit
     with:
       library: python_lambda
-      ref: '17a45f60c216a142ced110eb15f63a4acc2a0b4a'
+      ref: '692e9462ef7296cf1224c0d2bd3a3623a1bfe590'
       binaries_artifact: serverless_system_tests_binaries
       scenarios_groups: lambda_end_to_end
       skip_empty_scenarios: true
@@ -126,22 +126,22 @@ jobs:
     if: github.event_name != 'schedule' || github.event.repository.fork == false
     needs: [integration-frameworks-combine-wheels]
     # Automatically managed, use scripts/update-system-tests-version to update
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@17a45f60c216a142ced110eb15f63a4acc2a0b4a
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@692e9462ef7296cf1224c0d2bd3a3623a1bfe590
     secrets: inherit
     with:
       library: python
-      ref: '17a45f60c216a142ced110eb15f63a4acc2a0b4a'
+      ref: '692e9462ef7296cf1224c0d2bd3a3623a1bfe590'
       scenarios: INTEGRATION_FRAMEWORKS
       binaries_artifact: integration-frameworks-wheels
       push_to_test_optimization: true
 
   tracer-release:
     needs:
       - download-s3-wheels
-    uses: DataDog/system-tests/.github/workflows/system-tests.yml@17a45f60c216a142ced110eb15f63a4acc2a0b4a
+    uses: DataDog/system-tests/.github/workflows/system-tests.yml@692e9462ef7296cf1224c0d2bd3a3623a1bfe590
     with:
       library: python
-      ref: '17a45f60c216a142ced110eb15f63a4acc2a0b4a'
+      ref: '692e9462ef7296cf1224c0d2bd3a3623a1bfe590'
       binaries_artifact: wheels-manylinux_x86_64
       desired_execution_time: 900
       scenarios_groups: tracer-release

.gitlab-ci.yml

@@ -18,7 +18,7 @@ variables:
   DD_VPA_TEMPLATE: "vpa-template-cpu-p70-10percent-2x-oom-min-cap"
   # CI_DEBUG_SERVICES: "true"
   # Automatically managed, use scripts/update-system-tests-version to update
-  SYSTEM_TESTS_REF: "17a45f60c216a142ced110eb15f63a4acc2a0b4a"
+  SYSTEM_TESTS_REF: "692e9462ef7296cf1224c0d2bd3a3623a1bfe590"
 
   # Profiling native build image (built from dd/images/dd-trace-py/profiling_native)
   PROFILING_NATIVE_IMAGE: "registry.ddbuild.io/dd-trace-py:v103334885-be1888c-profiling_native"

ddtrace/internal/native/_native.pyi

@@ -640,9 +640,6 @@ class TraceExporterBuilder:
         :param process_tags: Comma-separated list of key:value process tags (e.g., "key1:val1,key2:val2").
         """
         ...
-    def set_tracer_tags(self, tracer_tags: list[str]) -> TraceExporterBuilder:
-        """Set tracer tags on the OTLP metrics resource."""
-        ...
     def set_tracer_version(self, version: str) -> TraceExporterBuilder:
         """
         Set the tracer version of the TraceExporter.
@@ -711,10 +708,6 @@ class TraceExporterBuilder:
         :param bucket_size_ns: The size of stats bucket in nanoseconds.
         """
 
-    def set_additional_metric_tag_keys(self, tag_keys: list[str]) -> TraceExporterBuilder:
-        """Set span tag keys included in computed stats."""
-        ...
-
     def enable_client_side_stats_obfuscation(self) -> TraceExporterBuilder:
         """
         Obfuscate client side stats buckets in the client instead of in the agent.

ddtrace/internal/settings/_config.py

@@ -658,11 +658,6 @@ def __init__(self) -> None:
             "DD_TRACE_STATS_COMPUTATION_ENABLED", trace_compute_stats_default, asbool
         )
         self._otel_stats_computation_enabled = _get_config("OTEL_TRACES_SPAN_METRICS_ENABLED", None, asbool)
-        self._trace_stats_additional_tags = _get_config(
-            "DD_TRACE_STATS_ADDITIONAL_TAGS",
-            [],
-            lambda value: [tag.strip() for tag in value.split(",") if tag.strip()],
-        )
         self._client_side_stats_obfuscation = _get_config(
             "_DD_TRACE_STATS_COMPUTATION_EXPERIMENTAL_CLIENT_OBFUSCATION_ENABLED", True, asbool
         )

ddtrace/internal/settings/_supported_configurations.py

@@ -667,7 +667,6 @@
         "DD_TRACE_SQLITE_ENABLED",
         "DD_TRACE_STARLETTE_ENABLED",
         "DD_TRACE_STARTUP_LOGS",
-        "DD_TRACE_STATS_ADDITIONAL_TAGS",
         "DD_TRACE_STATS_COMPUTATION_ENABLED",
         "DD_TRACE_STRUCTLOG_ENABLED",
         "DD_TRACE_SUBPROCESS_ENABLED",

ddtrace/internal/writer/writer.py

@@ -69,7 +69,6 @@
 log = get_logger(__name__)
 
 LOG_ERR_INTERVAL = 60
-_OTLP_TRACER_TAG_RESERVED_KEYS = frozenset({"service", "env", "version", "runtime_id", "runtime-id"})
 
 
 def _safelog(log_func: Callable[..., None], msg: str, *args, **kwargs) -> None:
@@ -762,16 +761,6 @@ def _build_base_exporter_builder(
         builder.set_app_version(config.version)
     if test_session_token is not None:
         builder.set_test_session_token(test_session_token)
-    if otlp_metrics_enabled:
-        tracer_tags = [
-            f"{key}:{value}"
-            for key, value in sorted(config.tags.items())
-            if key.lower() not in _OTLP_TRACER_TAG_RESERVED_KEYS and value
-        ]
-        if tracer_tags:
-            builder.set_tracer_tags(tracer_tags)
-    if config._trace_stats_additional_tags:
-        builder.set_additional_metric_tag_keys(config._trace_stats_additional_tags)
     # OTLP trace metrics require the native concentrator regardless of DD_TRACE_STATS_COMPUTATION_ENABLED.
     if otlp_metrics_enabled or (compute_stats_enabled and not stats_opt_out):
         if otlp_metrics_enabled:

releasenotes/notes/fix-otlp-trace-metrics-attributes-83cad1e1cdcc65c7.yaml

@@ -80,14 +80,6 @@ impl TraceExporterBuilderPy {
         Ok(slf.into())
     }
 
-    fn set_tracer_tags(
-        mut slf: PyRefMut<'_, Self>,
-        tracer_tags: Vec<String>,
-    ) -> PyResult<Py<Self>> {
-        slf.try_as_mut()?.set_tracer_tags(tracer_tags);
-        Ok(slf.into())
-    }
-
     fn set_tracer_version(mut slf: PyRefMut<'_, Self>, version: &'_ str) -> PyResult<Py<Self>> {
         slf.try_as_mut()?.set_tracer_version(version);
         Ok(slf.into())
@@ -160,14 +152,6 @@ impl TraceExporterBuilderPy {
         Ok(slf.into())
     }
 
-    fn set_additional_metric_tag_keys(
-        mut slf: PyRefMut<'_, Self>,
-        tag_keys: Vec<String>,
-    ) -> PyResult<Py<Self>> {
-        slf.try_as_mut()?.set_additional_metric_tag_keys(tag_keys);
-        Ok(slf.into())
-    }
-
     fn enable_client_side_stats_obfuscation(mut slf: PyRefMut<'_, Self>) -> PyResult<Py<Self>> {
         slf.try_as_mut()?.enable_client_side_stats_obfuscation();
         Ok(slf.into())

src/native/data_pipeline/mod.rs

@@ -5000,14 +5000,6 @@
         "default": "false"
       }
     ],
-    "DD_TRACE_STATS_ADDITIONAL_TAGS": [
-      {
-        "implementation": "B",
-        "type": "string",
-        "default": null,
-        "experimental": true
-      }
-    ],
     "DD_TRACE_STATS_COMPUTATION_ENABLED": [
       {
         "implementation": "C",

supported-configurations.json

@@ -148,8 +148,8 @@ def log_message(self, *args):
     # No InstrumentationScope is emitted (redundant with the resource's telemetry.sdk.* attributes).
     assert "scope" not in scope_metrics
     # Service identity lives on the resource.
-    resource_attrs = {a["key"]: a["value"] for a in resource_metrics["resource"]["attributes"]}
-    assert resource_attrs["service.name"]["stringValue"] == "test-svc"
+    resource_attrs = {a["key"]: a["value"]["stringValue"] for a in resource_metrics["resource"]["attributes"]}
+    assert resource_attrs["service.name"] == "test-svc"
     assert metric["histogram"]["dataPoints"], "No data points in exported histogram"