Merge pull request #568 from iRevive/update-sem-conv

Update `opentelemetry-semconv` to `1.24.0-alpha`

.github/workflows/ci.yml

@@ -88,11 +88,11 @@ jobs:
 
       - name: Make target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: mkdir -p oteljava/metrics/target sdk-exporter/common/.js/target sdk/common/.native/target sdk/common/.js/target core/trace/.js/target semconv/.jvm/target sdk-exporter/all/.jvm/target sdk/trace/.js/target core/common/.jvm/target sdk-exporter/common/.native/target oteljava/common-testkit/target sdk-exporter/trace/.jvm/target unidocs/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target sdk/all/.native/target core/metrics/.js/target core/all/.jvm/target sdk-exporter/trace/.native/target sdk/common/.jvm/target core/trace/.native/target oteljava/metrics-testkit/target sdk/trace/.native/target semconv/.js/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk-exporter/trace/.js/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target oteljava/testkit/target semconv/.native/target sdk-exporter/all/.js/target sdk/all/.js/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target project/target
+        run: mkdir -p semconv/stable/.jvm/target oteljava/metrics/target sdk-exporter/common/.js/target sdk/common/.native/target sdk/common/.js/target core/trace/.js/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target sdk/trace/.js/target core/common/.jvm/target sdk-exporter/common/.native/target oteljava/common-testkit/target sdk-exporter/trace/.jvm/target unidocs/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target semconv/experimental/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk/all/.native/target core/metrics/.js/target core/all/.jvm/target sdk-exporter/trace/.native/target sdk/common/.jvm/target core/trace/.native/target oteljava/metrics-testkit/target sdk/trace/.native/target semconv/experimental/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk-exporter/trace/.js/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target oteljava/testkit/target sdk-exporter/all/.js/target sdk/all/.js/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target semconv/stable/.js/target project/target
 
       - name: Compress target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')
-        run: tar cf targets.tar oteljava/metrics/target sdk-exporter/common/.js/target sdk/common/.native/target sdk/common/.js/target core/trace/.js/target semconv/.jvm/target sdk-exporter/all/.jvm/target sdk/trace/.js/target core/common/.jvm/target sdk-exporter/common/.native/target oteljava/common-testkit/target sdk-exporter/trace/.jvm/target unidocs/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target sdk/all/.native/target core/metrics/.js/target core/all/.jvm/target sdk-exporter/trace/.native/target sdk/common/.jvm/target core/trace/.native/target oteljava/metrics-testkit/target sdk/trace/.native/target semconv/.js/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk-exporter/trace/.js/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target oteljava/testkit/target semconv/.native/target sdk-exporter/all/.js/target sdk/all/.js/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target project/target
+        run: tar cf targets.tar semconv/stable/.jvm/target oteljava/metrics/target sdk-exporter/common/.js/target sdk/common/.native/target sdk/common/.js/target core/trace/.js/target sdk-exporter/all/.jvm/target semconv/experimental/.js/target sdk/trace/.js/target core/common/.jvm/target sdk-exporter/common/.native/target oteljava/common-testkit/target sdk-exporter/trace/.jvm/target unidocs/target oteljava/trace-testkit/target core/metrics/.native/target core/all/.native/target sdk/trace-testkit/.jvm/target sdk/trace-testkit/.native/target semconv/experimental/.native/target core/metrics/.jvm/target core/all/.js/target sdk-exporter/proto/.jvm/target sdk-exporter/proto/.js/target semconv/stable/.native/target sdk/all/.native/target core/metrics/.js/target core/all/.jvm/target sdk-exporter/trace/.native/target sdk/common/.jvm/target core/trace/.native/target oteljava/metrics-testkit/target sdk/trace/.native/target semconv/experimental/.jvm/target oteljava/common/target scalafix/rules/target sdk-exporter/proto/.native/target core/trace/.jvm/target sdk-exporter/common/.jvm/target sdk-exporter/trace/.js/target core/common/.native/target sdk/trace-testkit/.js/target core/common/.js/target oteljava/trace/target oteljava/testkit/target sdk-exporter/all/.js/target sdk/all/.js/target sdk/all/.jvm/target sdk-exporter/all/.native/target oteljava/all/target sdk/trace/.jvm/target semconv/stable/.js/target project/target
 
       - name: Upload target directories
         if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main')

build.sbt

@@ -51,7 +51,7 @@ val MUnitDisciplineVersion = "2.0.0-M3"
 val MUnitScalaCheckEffectVersion = "2.0.0-M2"
 val OpenTelemetryVersion = "1.36.0"
 val OpenTelemetryInstrumentationVersion = "2.2.0"
-val OpenTelemetrySemConvVersion = "1.23.1-alpha"
+val OpenTelemetrySemConvVersion = "1.24.0-alpha"
 val OpenTelemetryProtoVersion = "1.1.0-alpha"
 val PekkoStreamVersion = "1.0.2"
 val PekkoHttpVersion = "1.0.1"
@@ -110,7 +110,8 @@ lazy val root = tlCrossRootProject
     `oteljava-trace-testkit`,
     `oteljava-testkit`,
     oteljava,
-    semconv,
+    `semconv-stable`,
+    `semconv-experimental`,
     benchmarks,
     examples,
     unidocs
@@ -196,7 +197,7 @@ lazy val `sdk-common` = crossProject(JVMPlatform, JSPlatform, NativePlatform)
   .crossType(CrossType.Pure)
   .enablePlugins(BuildInfoPlugin)
   .in(file("sdk/common"))
-  .dependsOn(`core-common` % "compile->compile;test->test", semconv)
+  .dependsOn(`core-common` % "compile->compile;test->test", `semconv-stable`)
   .settings(
     name := "otel4s-sdk-common",
     startYear := Some(2023),
@@ -478,24 +479,41 @@ lazy val oteljava = project
   .settings(munitDependencies)
   .settings(scalafixSettings)
 
-lazy val semconv = crossProject(JVMPlatform, JSPlatform, NativePlatform)
-  .crossType(CrossType.Pure)
-  .enablePlugins(BuildInfoPlugin)
-  .in(file("semconv"))
-  .dependsOn(`core-common`)
-  .settings(
-    name := "otel4s-semconv",
-    startYear := Some(2023),
-    // We use opentelemetry-semconv dependency to track releases of the OpenTelemetry semantic convention spec
-    libraryDependencies += "io.opentelemetry.semconv" % "opentelemetry-semconv" % OpenTelemetrySemConvVersion % "compile-internal" intransitive (),
-    buildInfoPackage := "org.typelevel.otel4s.semconv",
-    buildInfoOptions += sbtbuildinfo.BuildInfoOption.PackagePrivate,
-    buildInfoKeys := Seq[BuildInfoKey](
-      "openTelemetrySemanticConventionsVersion" -> OpenTelemetrySemConvVersion
+lazy val `semconv-stable` =
+  crossProject(JVMPlatform, JSPlatform, NativePlatform)
+    .crossType(CrossType.Pure)
+    .enablePlugins(BuildInfoPlugin)
+    .in(file("semconv/stable"))
+    .dependsOn(`core-common`)
+    .settings(
+      name := "otel4s-semconv",
+      startYear := Some(2023),
+      description := "Stable semantic conventions.",
+      // We use opentelemetry-semconv dependency to track releases of the OpenTelemetry semantic convention spec
+      libraryDependencies += "io.opentelemetry.semconv" % "opentelemetry-semconv" % OpenTelemetrySemConvVersion % "compile-internal" intransitive (),
+      buildInfoPackage := "org.typelevel.otel4s.semconv",
+      buildInfoOptions += sbtbuildinfo.BuildInfoOption.PackagePrivate,
+      buildInfoKeys := Seq[BuildInfoKey](
+        "openTelemetrySemanticConventionsVersion" -> OpenTelemetrySemConvVersion
+      )
     )
-  )
-  .settings(munitDependencies)
-  .settings(scalafixSettings)
+    .settings(munitDependencies)
+    .settings(scalafixSettings)
+
+lazy val `semconv-experimental` =
+  crossProject(JVMPlatform, JSPlatform, NativePlatform)
+    .crossType(CrossType.Pure)
+    .in(file("semconv/experimental"))
+    .dependsOn(`core-common`)
+    .settings(
+      name := "otel4s-semconv-experimental",
+      description := "Experimental (incubating) semantic conventions. Breaking changes expected. Library instrumentation SHOULD NOT depend on this.",
+      startYear := Some(2023),
+      // We use opentelemetry-semconv dependency to track releases of the OpenTelemetry semantic convention spec
+      libraryDependencies += "io.opentelemetry.semconv" % "opentelemetry-semconv-incubating" % OpenTelemetrySemConvVersion % "compile-internal" intransitive (),
+    )
+    .settings(munitDependencies)
+    .settings(scalafixSettings)
 
 lazy val scalafix = tlScalafixProject
   .rulesSettings(
@@ -617,6 +635,7 @@ lazy val unidocs = project
       `oteljava-trace-testkit`,
       `oteljava-testkit`,
       oteljava,
-      semconv.jvm
+      `semconv-stable`.jvm,
+      `semconv-experimental`.jvm
     )
   )