sdk: use TelemetryResource.default as an initial resource in `Telem…

…etryResourceAutoConfigure`
typelevel · Mar 4, 2024 · 6eeb457 · 6eeb457
1 parent c6ad789
commit 6eeb457
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 10 deletions.
diff --git a/sdk/all/src/test/scala/org/typelevel/otel4s/sdk/OpenTelemetrySdkSuite.scala b/sdk/all/src/test/scala/org/typelevel/otel4s/sdk/OpenTelemetrySdkSuite.scala
@@ -47,7 +47,7 @@ class OpenTelemetrySdkSuite extends CatsEffectSuite {
 
   private val DefaultSdk =
     sdkToString(
-      TelemetryResource.empty,
+      TelemetryResource.default,
       Sampler.parentBased(Sampler.AlwaysOn)
     )
 
@@ -56,7 +56,7 @@ class OpenTelemetrySdkSuite extends CatsEffectSuite {
       "OpenTelemetrySdk{" +
       "meterProvider=MeterProvider.Noop, " +
       "tracerProvider=TracerProvider.Noop, " +
-      s"propagators=ContextPropagators.Noop}, resource=${TelemetryResource.empty}}"
+      s"propagators=ContextPropagators.Noop}, resource=${TelemetryResource.default}}"
 
   test("withConfig - use the given config") {
     val config = Config.ofProps(Map("otel.traces.exporter" -> "none"))
@@ -261,7 +261,7 @@ class OpenTelemetrySdkSuite extends CatsEffectSuite {
   }
 
   private def sdkToString(
-      resource: TelemetryResource = TelemetryResource.empty,
+      resource: TelemetryResource = TelemetryResource.default,
       sampler: Sampler = Sampler.parentBased(Sampler.AlwaysOn),
       propagators: ContextPropagators[Context] = ContextPropagators.of(
         W3CTraceContextPropagator.default,

diff --git a/...rc/main/scala/org/typelevel/otel4s/sdk/autoconfigure/TelemetryResourceAutoConfigure.scala b/...rc/main/scala/org/typelevel/otel4s/sdk/autoconfigure/TelemetryResourceAutoConfigure.scala
@@ -80,9 +80,12 @@ private final class TelemetryResourceAutoConfigure[F[_]: MonadThrow]
         .flatten
         .map(value => ResourceAttributes.ServiceName(value))
 
-      TelemetryResource(
+      val default = TelemetryResource.default
+      val fromEnv = TelemetryResource(
         Attributes.fromSpecific(attributes ++ serviceName.toSeq)
       )
+
+      default.mergeUnsafe(fromEnv)
     }
 
     Resource.eval(MonadThrow[F].fromEither(attempt))

diff --git a/...st/scala/org/typelevel/otel4s/sdk/autoconfigure/TelemetryResourceAutoConfigureSuite.scala b/...st/scala/org/typelevel/otel4s/sdk/autoconfigure/TelemetryResourceAutoConfigureSuite.scala
@@ -23,14 +23,14 @@ import munit.CatsEffectSuite
 
 class TelemetryResourceAutoConfigureSuite extends CatsEffectSuite {
 
-  test("load from an empty config") {
+  test("load from an empty config - use default as a fallback") {
     val config = Config(Map.empty, Map.empty, Map.empty)
     TelemetryResourceAutoConfigure[IO].configure(config).use { resource =>
-      IO(assertEquals(resource, TelemetryResource.empty))
+      IO(assertEquals(resource, TelemetryResource.default))
     }
   }
 
-  test("load from the config") {
+  test("load from the config - use default as an initial resource") {
     val props = Map(
       "otel.service.name" -> "some-service",
       "otel.resource.attributes" -> "key1=val1,key2=val2,key3=val3",
@@ -44,8 +44,12 @@ class TelemetryResourceAutoConfigureSuite extends CatsEffectSuite {
       Attribute("service.name", "some-service")
     )
 
+    val expected = TelemetryResource.default.mergeUnsafe(
+      TelemetryResource(expectedAttributes)
+    )
+
     TelemetryResourceAutoConfigure[IO].configure(config).use { resource =>
-      IO(assertEquals(resource, TelemetryResource(expectedAttributes)))
+      IO(assertEquals(resource, expected))
     }
   }
 }
diff --git a/sdk/trace/src/test/scala/org/typelevel/otel4s/sdk/trace/SdkTracesSuite.scala b/sdk/trace/src/test/scala/org/typelevel/otel4s/sdk/trace/SdkTracesSuite.scala
@@ -47,7 +47,7 @@ class SdkTracesSuite extends CatsEffectSuite {
 
   private val DefaultTraces =
     tracesToString(
-      TelemetryResource.empty,
+      TelemetryResource.default,
       Sampler.parentBased(Sampler.AlwaysOn)
     )
 
@@ -258,7 +258,7 @@ class SdkTracesSuite extends CatsEffectSuite {
   }
 
   private def tracesToString(
-      resource: TelemetryResource = TelemetryResource.empty,
+      resource: TelemetryResource = TelemetryResource.default,
       sampler: Sampler = Sampler.parentBased(Sampler.AlwaysOn),
       propagators: ContextPropagators[Context] = ContextPropagators.of(
         W3CTraceContextPropagator.default,