merge OTELResourceDetector result

Author: aabmass

Diff for: opentelemetry-sdk/CHANGELOG.md

@@ -14,6 +14,8 @@
   ([#1053](https://github.com/open-telemetry/opentelemetry-python/pull/1053))
 - Rename Resource labels to attributes
   ([#1082](https://github.com/open-telemetry/opentelemetry-python/pull/1082))
+- Merge `OTELResourceDetector` result when creating resources
+  ([#1096](https://github.com/open-telemetry/opentelemetry-python/pull/1096))
 
 ## Version 0.12b0
 

Diff for: opentelemetry-sdk/src/opentelemetry/sdk/resources/__init__.py

@@ -33,17 +33,20 @@
 OPENTELEMETRY_SDK_VERSION = pkg_resources.get_distribution(
     "opentelemetry-sdk"
 ).version
+OTEL_RESOURCE_ATTRIBUTES = "OTEL_RESOURCE_ATTRIBUTES"
 
 
 class Resource:
     def __init__(self, attributes: Attributes):
         self._attributes = attributes.copy()
 
     @staticmethod
-    def create(attributes: Attributes) -> "Resource":
+    def create(attributes: typing.Optional[Attributes]) -> "Resource":
         if not attributes:
-            return _DEFAULT_RESOURCE
-        return _DEFAULT_RESOURCE.merge(Resource(attributes))
+            resource = _DEFAULT_RESOURCE
+        else:
+            resource = _DEFAULT_RESOURCE.merge(Resource(attributes))
+        return resource.merge(OTELResourceDetector().detect())
 
     @staticmethod
     def create_empty() -> "Resource":
@@ -70,16 +73,6 @@ def __hash__(self):
         return hash(dumps(self._attributes, sort_keys=True))
 
 
-_EMPTY_RESOURCE = Resource({})
-_DEFAULT_RESOURCE = Resource(
-    {
-        TELEMETRY_SDK_LANGUAGE: "python",
-        TELEMETRY_SDK_NAME: "opentelemetry",
-        TELEMETRY_SDK_VERSION: OPENTELEMETRY_SDK_VERSION,
-    }
-)
-
-
 class ResourceDetector(abc.ABC):
     def __init__(self, raise_on_error=False):
         self.raise_on_error = raise_on_error
@@ -92,7 +85,7 @@ def detect(self) -> "Resource":
 class OTELResourceDetector(ResourceDetector):
     # pylint: disable=no-self-use
     def detect(self) -> "Resource":
-        env_resources_items = os.environ.get("OTEL_RESOURCE_ATTRIBUTES")
+        env_resources_items = os.environ.get(OTEL_RESOURCE_ATTRIBUTES)
         env_resource_map = {}
         if env_resources_items:
             env_resource_map = {
@@ -104,6 +97,16 @@ def detect(self) -> "Resource":
         return Resource(env_resource_map)
 
 
+_EMPTY_RESOURCE = Resource({})
+_DEFAULT_RESOURCE = Resource(
+    {
+        TELEMETRY_SDK_LANGUAGE: "python",
+        TELEMETRY_SDK_NAME: "opentelemetry",
+        TELEMETRY_SDK_VERSION: OPENTELEMETRY_SDK_VERSION,
+    }
+).merge(OTELResourceDetector().detect())
+
+
 def get_aggregated_resources(
     detectors: typing.List["ResourceDetector"],
     initial_resource: typing.Optional[Resource] = None,

Diff for: opentelemetry-sdk/tests/metrics/test_metrics.py

@@ -40,7 +40,7 @@ def test_resource_empty(self):
         meter_provider = metrics.MeterProvider()
         meter = meter_provider.get_meter(__name__)
         # pylint: disable=protected-access
-        self.assertIs(meter.resource, resources._DEFAULT_RESOURCE)
+        self.assertEqual(meter.resource, resources._DEFAULT_RESOURCE)
 
     def test_start_pipeline(self):
         exporter = mock.Mock()

Diff for: opentelemetry-sdk/tests/resources/test_resources.py

@@ -22,6 +22,12 @@
 
 
 class TestResources(unittest.TestCase):
+    def setUp(self) -> None:
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = ""
+
+    def tearDown(self) -> None:
+        os.environ.pop(resources.OTEL_RESOURCE_ATTRIBUTES)
+
     def test_create(self):
         attributes = {
             "service": "ui",
@@ -44,14 +50,22 @@ def test_create(self):
         self.assertIsInstance(resource, resources.Resource)
         self.assertEqual(resource.attributes, expected_attributes)
 
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = "key=value"
+        resource = resources.Resource.create(attributes)
+        self.assertIsInstance(resource, resources.Resource)
+        expected_with_envar = expected_attributes.copy()
+        expected_with_envar["key"] = "value"
+        self.assertEqual(resource.attributes, expected_with_envar)
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = ""
+
         resource = resources.Resource.create_empty()
-        self.assertIs(resource, resources._EMPTY_RESOURCE)
+        self.assertEqual(resource, resources._EMPTY_RESOURCE)
 
         resource = resources.Resource.create(None)
-        self.assertIs(resource, resources._DEFAULT_RESOURCE)
+        self.assertEqual(resource, resources._DEFAULT_RESOURCE)
 
         resource = resources.Resource.create({})
-        self.assertIs(resource, resources._DEFAULT_RESOURCE)
+        self.assertEqual(resource, resources._DEFAULT_RESOURCE)
 
     def test_resource_merge(self):
         left = resources.Resource({"service": "ui"})
@@ -184,36 +198,38 @@ def test_resource_detector_raise_error(self):
 
 class TestOTELResourceDetector(unittest.TestCase):
     def setUp(self) -> None:
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = ""
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = ""
 
     def tearDown(self) -> None:
-        os.environ.pop("OTEL_RESOURCE_ATTRIBUTES")
+        os.environ.pop(resources.OTEL_RESOURCE_ATTRIBUTES)
 
     def test_empty(self):
         detector = resources.OTELResourceDetector()
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = ""
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = ""
         self.assertEqual(detector.detect(), resources.Resource.create_empty())
 
     def test_one(self):
         detector = resources.OTELResourceDetector()
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = "k=v"
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = "k=v"
         self.assertEqual(detector.detect(), resources.Resource({"k": "v"}))
 
     def test_one_with_whitespace(self):
         detector = resources.OTELResourceDetector()
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = "    k  = v   "
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = "    k  = v   "
         self.assertEqual(detector.detect(), resources.Resource({"k": "v"}))
 
     def test_multiple(self):
         detector = resources.OTELResourceDetector()
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = "k=v,k2=v2"
+        os.environ[resources.OTEL_RESOURCE_ATTRIBUTES] = "k=v,k2=v2"
         self.assertEqual(
             detector.detect(), resources.Resource({"k": "v", "k2": "v2"})
         )
 
     def test_multiple_with_whitespace(self):
         detector = resources.OTELResourceDetector()
-        os.environ["OTEL_RESOURCE_ATTRIBUTES"] = "    k  = v  , k2   = v2 "
+        os.environ[
+            resources.OTEL_RESOURCE_ATTRIBUTES
+        ] = "    k  = v  , k2   = v2 "
         self.assertEqual(
             detector.detect(), resources.Resource({"k": "v", "k2": "v2"})
         )

Diff for: opentelemetry-sdk/tests/trace/test_trace.py

@@ -396,7 +396,7 @@ def test_default_span_resource(self):
         tracer = tracer_provider.get_tracer(__name__)
         span = tracer.start_span("root")
         # pylint: disable=protected-access
-        self.assertIs(span.resource, resources._DEFAULT_RESOURCE)
+        self.assertEqual(span.resource, resources._DEFAULT_RESOURCE)
 
     def test_span_context_remote_flag(self):
         tracer = new_tracer()