Merge branch 'main' into update/opentelemetry-exporter-otlp-1.37.0

build.sbt

@@ -180,7 +180,7 @@ lazy val lightstepGrpc = project
     description := "Lightstep gRPC bindings for Natchez.",
     libraryDependencies ++= Seq(
       "com.lightstep.tracer" % "tracer-grpc" % "0.32.0",
-      "io.grpc" % "grpc-netty" % "1.62.2",
+      "io.grpc" % "grpc-netty" % "1.63.0",
       "io.netty" % "netty-tcnative-boringssl-static" % "2.0.65.Final"
     ),
     mimaPreviousArtifacts := Set()
@@ -237,8 +237,8 @@ lazy val datadog = project
     name := "natchez-datadog",
     description := "Datadog bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "com.datadoghq" % "dd-trace-ot" % "1.31.2",
-      "com.datadoghq" % "dd-trace-api" % "1.31.2"
+      "com.datadoghq" % "dd-trace-ot" % "1.33.0",
+      "com.datadoghq" % "dd-trace-api" % "1.33.0"
     )
   )
 
@@ -251,7 +251,7 @@ lazy val log = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     name := "natchez-log",
     description := "Logging bindings for Natchez, using log4cats.",
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-core" % "0.14.6",
+      "io.circe" %%% "circe-core" % "0.14.7",
       "org.typelevel" %%% "log4cats-core" % "2.6.0",
       "io.github.cquiroz" %%% "scala-java-time" % "2.5.0" % Test
     )
@@ -269,7 +269,7 @@ lazy val newrelic = project
     name := "newrelic",
     description := "Newrelic bindings for Natchez.",
     libraryDependencies ++= Seq(
-      "io.circe" %% "circe-core" % "0.14.6",
+      "io.circe" %% "circe-core" % "0.14.7",
       "com.newrelic.telemetry" % "telemetry" % "0.10.0",
       "com.newrelic.telemetry" % "telemetry-core" % "0.16.0",
       "com.newrelic.telemetry" % "telemetry-http-okhttp" % "0.16.0"
@@ -319,7 +319,7 @@ lazy val xray = crossProject(JSPlatform, JVMPlatform)
     name := "natchez-xray",
     description := "AWS X-Ray bindings implementation",
     libraryDependencies ++= Seq(
-      "io.circe" %%% "circe-core" % "0.14.6",
+      "io.circe" %%% "circe-core" % "0.14.7",
       "co.fs2" %%% "fs2-io" % fs2Version,
       "com.comcast" %%% "ip4s-core" % "3.5.0",
       "org.scodec" %%% "scodec-bits" % "1.1.38"
@@ -363,12 +363,12 @@ lazy val examples = project
     scalacOptions -= "-Xfatal-warnings",
     libraryDependencies ++= Seq(
       "org.typelevel" %% "log4cats-slf4j" % "2.6.0",
-      "org.slf4j" % "slf4j-simple" % "2.0.12",
+      "org.slf4j" % "slf4j-simple" % "2.0.13",
       "eu.timepit" %% "refined" % "0.11.1",
       "is.cir" %% "ciris" % "3.5.0",
       "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.37.0",
       "io.opentelemetry.semconv" % "opentelemetry-semconv" % "1.22.0-alpha",
-      "io.grpc" % "grpc-okhttp" % "1.62.2" // required for the OpenTelemetry exporter
+      "io.grpc" % "grpc-okhttp" % "1.63.0" // required for the OpenTelemetry exporter
     )
   )
 
@@ -436,7 +436,7 @@ lazy val docs = project
       "org.http4s" %% "http4s-dsl" % "0.23.15",
       "org.http4s" %% "http4s-client" % "0.23.15",
       "org.typelevel" %% "log4cats-slf4j" % "2.4.0",
-      "org.slf4j" % "slf4j-simple" % "2.0.12",
+      "org.slf4j" % "slf4j-simple" % "2.0.13",
       "io.opentelemetry" % "opentelemetry-exporter-otlp" % "1.37.0", // for the opentelemetry example
       "io.opentelemetry.semconv" % "opentelemetry-semconv" % "1.22.0-alpha"
     ),

modules/xray/src/main/scala/natchez/xray/XRaySpan.scala

@@ -124,6 +124,9 @@ private[xray] final case class XRaySpan[F[_]: Concurrent: Clock: Random](
         "trace_id" -> xrayTraceId.asJson,
         "subsegments" -> cs.reverse.map(Json.fromJsonObject).asJson,
         "annotations" -> allAnnotations.asJson,
+        "parent_id" -> parent
+          .map(p => p.fold(_.asJson, p => p.segmentId.asJson))
+          .getOrElse(Json.fromJsonObject(JsonObject.empty)),
         "metadata" -> JsonObject(
           "links" -> options.links.asJson,
           "span.kind" -> options.spanKind.asJson

project/plugins.sbt

@@ -5,7 +5,7 @@ ThisBuild / libraryDependencySchemes ++= Seq(
 
 addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.6.7")
 addSbtPlugin("org.typelevel" % "sbt-typelevel-mergify" % "0.6.7")
-addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.6")
+addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
 addSbtPlugin("com.github.sbt" % "sbt-site" % "1.6.0")
 addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.6.0")
 addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0")