Fix Attributes.apply methods resolution (#913)

* rename Attributes.apply for sequence to Attributes.fromList * Add test * scalafix
zio · Nov 25, 2024 · 3be3ba0 · 3be3ba0
1 parent 9362c50
commit 3be3ba0
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 3 deletions.
diff --git a/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/common/Attributes.scala b/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/common/Attributes.scala
@@ -10,7 +10,7 @@ object Attributes {
   def empty: api.common.Attributes =
     api.common.Attributes.empty()
 
-  def apply[T](attributes: Attribute[T]*): api.common.Attributes = {
+  def fromList[T](attributes: List[Attribute[T]]): api.common.Attributes = {
     val builder = api.common.Attributes.builder()
 
     attributes.foreach(attr => builder.put(attr.key, attr.value))

diff --git a/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/metrics/internal/package.scala b/opentelemetry/src/main/scala/zio/telemetry/opentelemetry/metrics/internal/package.scala
@@ -8,15 +8,15 @@ import zio.telemetry.opentelemetry.common.{Attribute, Attributes}
 package object internal {
 
   private[metrics] def attributes(tags: Set[MetricLabel]): api.common.Attributes =
-    Attributes(tags.map(t => Attribute.string(t.key, t.value)).toSeq: _*)
+    Attributes.fromList(tags.map(t => Attribute.string(t.key, t.value)).toList)
 
   private[metrics] def logAnnotatedAttributes(attributes: api.common.Attributes, logAnnotated: Boolean)(implicit
     trace: Trace
   ): UIO[api.common.Attributes] =
     if (logAnnotated)
       for {
         annotations <- ZIO.logAnnotations
-        annotated    = Attributes(annotations.map { case (k, v) => Attribute.string(k, v) }.toSeq: _*)
+        annotated    = Attributes.fromList(annotations.map { case (k, v) => Attribute.string(k, v) }.toList)
         builder      = api.common.Attributes.builder()
         _            = builder.putAll(annotated)
         _            = builder.putAll(attributes)

diff --git a/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/common/AttributesSpec.scala b/opentelemetry/src/test/scala/zio/telemetry/opentelemetry/common/AttributesSpec.scala
@@ -0,0 +1,19 @@
+package zio.telemetry.opentelemetry.common
+
+import zio.test.{ZIOSpecDefault, _}
+
+object AttributesSpec extends ZIOSpecDefault {
+
+  override def spec: Spec[Any, Throwable] =
+    suite("zio opentelemetry")(
+      suite("Attributes")(
+        // Addresses the bug: https://github.com/zio/zio-telemetry/issues/911
+        test("Check methods resolution in compile time") {
+          val _ = Attributes(Attribute.string("foo", "bar"), Attribute.string("dog", "fox"))
+
+          assertTrue(true);
+        }
+      )
+    )
+
+}