From 4a39ae210ece2bfcf49f385b83a73f0c7a47429c Mon Sep 17 00:00:00 2001
From: Tammy Baylis <tammy.baylis@solarwinds.com>
Date: Wed, 18 Oct 2023 18:34:40 -0700
Subject: [PATCH] Tidy resource attrs for meterprovider

---
 solarwinds_apm/configurator.py | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/solarwinds_apm/configurator.py b/solarwinds_apm/configurator.py
index 2bf1517cb..62aa8bf0d 100644
--- a/solarwinds_apm/configurator.py
+++ b/solarwinds_apm/configurator.py
@@ -299,18 +299,22 @@ def _configure_metrics_exporter(
             reader = PeriodicExportingMetricReader(exporter)
             metric_readers.append(reader)
 
-        # This is not the only Resource we create in distro;
-        # should consolidate later?
+        # Use configured Resource attributes then merge with
+        # custom service.name and sw.trace_span_mode
+        resource = (
+            trace.get_tracer_provider()
+            .get_tracer(__name__)
+            .resource
+        )
+        sw_resource = Resource.create(
+            {
+                "sw.trace_span_mode": "otel",
+                "service.name": apm_config.service_name,
+            }
+        ).merge(resource)
 
-        # TODO If customer provides OTEL_RESOURCE_ATTRIBUTES then merge
-        #      with service.name and sw.trace_span_mode
         provider = MeterProvider(
-            resource=Resource.create(
-                {
-                    "sw.trace_span_mode": "otel",
-                    "service.name": apm_config.service_name,
-                }
-            ),
+            resource=sw_resource,
             metric_readers=metric_readers,
         )
         metrics.set_meter_provider(provider)