distro: enable containerid resource detector

Author: xrmx

src/elasticotel/distro/__init__.py

@@ -119,6 +119,13 @@ def _configure(self, **kwargs):
         os.environ.setdefault(OTEL_TRACES_SAMPLER, "parentbased_traceidratio")
         os.environ.setdefault(OTEL_TRACES_SAMPLER_ARG, "1.0")
 
-        base_resource_detectors = ["process_runtime", "os", "otel", "telemetry_distro", "service_instance"]
+        base_resource_detectors = [
+            "process_runtime",
+            "os",
+            "otel",
+            "telemetry_distro",
+            "service_instance",
+            "containerid",
+        ]
         detectors = base_resource_detectors + get_cloud_resource_detectors()
         os.environ.setdefault(OTEL_EXPERIMENTAL_RESOURCE_DETECTORS, ",".join(detectors))

tests/distro/test_distro.py

@@ -49,7 +49,7 @@ def test_default_configuration(self):
         self.assertEqual("otlp", os.environ.get(OTEL_LOGS_EXPORTER))
         self.assertEqual("grpc", os.environ.get(OTEL_EXPORTER_OTLP_PROTOCOL))
         self.assertEqual(
-            "process_runtime,os,otel,telemetry_distro,service_instance,_gcp,aws_ec2,aws_ecs,aws_elastic_beanstalk,azure_app_service,azure_vm",
+            "process_runtime,os,otel,telemetry_distro,service_instance,containerid,_gcp,aws_ec2,aws_ecs,aws_elastic_beanstalk,azure_app_service,azure_vm",
             os.environ.get(OTEL_EXPERIMENTAL_RESOURCE_DETECTORS),
         )
         self.assertEqual("always_off", os.environ.get(OTEL_METRICS_EXEMPLAR_FILTER))

tests/integration/test_integration.py

@@ -15,11 +15,14 @@
 # limitations under the License.
 
 import os.path
+from unittest import mock
 
 import pytest
 
 from .utils import ElasticIntegrationTestCase, OTEL_INSTRUMENTATION_VERSION, ROOT_DIR
 
+CONTAINER_ID = "7be92808767a667f35c8505cbf40d14e931ef6db5b0210329cf193b15ba9d60"
+
 
 @pytest.mark.integration
 class IntegrationTestCase(ElasticIntegrationTestCase):
@@ -35,6 +38,12 @@ def script(self):
         cursor = connection.cursor()
         cursor.execute("CREATE TABLE movie(title, year, score)")
 
+    @mock.patch(
+        "builtins.open",
+        new_callable=mock.mock_open,
+        read_data=f"""0::/system.slice/docker-{CONTAINER_ID}.scope
+        """,
+    )
     def test_traces_default_resource_attributes(self):
         stdout, stderr, returncode = self.run_script(self.script, wrapper_script="opentelemetry-instrument")
 
@@ -48,6 +57,7 @@ def test_traces_default_resource_attributes(self):
         self.assertTrue(resource["process.runtime.version"])
         self.assertTrue(resource["os.type"])
         self.assertTrue(resource["os.version"])
+        self.assertEqual(resource["container.id"], CONTAINER_ID)
 
     def test_traces_sets_resource_attributes_from_env(self):
         env = {"OTEL_RESOURCE_ATTRIBUTES": "service.name=my-service"}