Merge pull request #1158 from hughsimpson/bump_otel

Bump opentelemetry dependencies

Author: dpsoft

build.sbt

@@ -748,8 +748,10 @@ lazy val `kamon-opentelemetry` = (project in file("reporters/kamon-opentelemetry
   .settings(
     crossScalaVersions += `scala_3_version`,
     libraryDependencies ++= Seq(
-      "io.opentelemetry" % "opentelemetry-exporter-otlp-http-trace" % "1.11.0",
-      "io.opentelemetry" % "opentelemetry-exporter-otlp-trace" % "1.11.0",
+      "io.opentelemetry" % "opentelemetry-exporter-otlp-http-trace" % "1.13.0",
+      "io.opentelemetry" % "opentelemetry-exporter-otlp-trace" % "1.13.0",
+      // Compile-time dependency required in scala 3
+      "com.google.auto.value" % "auto-value-annotations" % "1.9" % "compile",
 
       scalatest % "test",
       logbackClassic % "test"

reporters/kamon-opentelemetry/src/main/scala/kamon/otel/SpanConverter.scala

@@ -24,7 +24,7 @@ import scala.collection.JavaConverters._
 
 import io.opentelemetry.api.common.{AttributeKey, Attributes}
 import io.opentelemetry.api.trace._
-import io.opentelemetry.sdk.common.InstrumentationLibraryInfo
+import io.opentelemetry.sdk.common.{InstrumentationLibraryInfo, InstrumentationScopeInfo}
 import io.opentelemetry.sdk.resources.Resource
 import io.opentelemetry.sdk.trace.data.{EventData, LinkData, SpanData, StatusData}
 import kamon.tag.{Lookups, Tag, TagSet}
@@ -34,8 +34,8 @@ import kamon.trace.{Identifier, Span}
 
 
 class SpanWrapper(includeErrorEvent: Boolean, resource: Resource, kamonVersion: String, span: Span.Finished) extends SpanData {
-  private val instrumentationLibraryInfo: InstrumentationLibraryInfo =
-    InstrumentationLibraryInfo.create(span.metricTags.get(Lookups.option(Span.TagKeys.Component)) getOrElse "kamon-instrumentation", kamonVersion)
+  private val instrumentationScopeInfo: InstrumentationScopeInfo =
+    InstrumentationScopeInfo.create(span.metricTags.get(Lookups.option(Span.TagKeys.Component)) getOrElse "kamon-instrumentation", kamonVersion, null)
   private val sampled: Boolean = span.trace.samplingDecision == Sample
   private val attachErrorEvent: Boolean = includeErrorEvent && span.hasError
 
@@ -78,7 +78,10 @@ class SpanWrapper(includeErrorEvent: Boolean, resource: Resource, kamonVersion:
 
   override def getTotalAttributeCount: Int = getAttributes.size()
 
-  override def getInstrumentationLibraryInfo: InstrumentationLibraryInfo = instrumentationLibraryInfo
+  override def getInstrumentationLibraryInfo: InstrumentationLibraryInfo =
+    InstrumentationLibraryInfo.create(instrumentationScopeInfo.getName, instrumentationScopeInfo.getVersion)
+
+  override def getInstrumentationScopeInfo: InstrumentationScopeInfo = instrumentationScopeInfo
 
   override def getResource: Resource = resource
 }

reporters/kamon-opentelemetry/src/test/scala/kamon/otel/OpenTelemetryTraceReporterSpec.scala

@@ -68,6 +68,11 @@ class OpenTelemetryTraceReporterSpec extends AnyWordSpec with Matchers with Opti
       instance should contain(s"kamon-test-application@${host.get}")
 
       //assert instrumentation labels
+      val instrumentationScopeInfo = spanData.getInstrumentationScopeInfo
+      instrumentationScopeInfo.getName should be("kamon-instrumentation")
+      instrumentationScopeInfo.getVersion should be(kamonVersion)
+      instrumentationScopeInfo.getSchemaUrl should be(null)
+      // deprecated
       val instrumentationLibraryInfo = spanData.getInstrumentationLibraryInfo
       instrumentationLibraryInfo.getName should be("kamon-instrumentation")
       instrumentationLibraryInfo.getVersion should be(kamonVersion)

reporters/kamon-opentelemetry/src/test/scala/kamon/otel/SpanConverterSpec.scala

@@ -147,8 +147,13 @@ class SpanConverterSpec extends AnyWordSpec with Matchers with Utils {
       resourceSpans.head.getResource.getAttributes.asMap().asScala should contain(AttributeKey.stringKey("telemetry.sdk.language"), "scala")
       resourceSpans.head.getResource.getAttributes.asMap().asScala should contain(AttributeKey.stringKey("telemetry.sdk.version"), "0.0.0")
 
-      val instInfo = resourceSpans.head.getInstrumentationLibraryInfo
+      val scopeInfo = resourceSpans.head.getInstrumentationScopeInfo
       //assert instrumentation labels
+      scopeInfo.getName should be("some-instrumentation-library")
+      scopeInfo.getVersion should be("0.0.0")
+      scopeInfo.getSchemaUrl should be(null)
+      // deprecated
+      val instInfo = resourceSpans.head.getInstrumentationLibraryInfo
       instInfo.getName should be("some-instrumentation-library")
       instInfo.getVersion should be("0.0.0")