Skip to content

Commit

Permalink
Merge pull request #1850 from softwaremill/update/akka-1.3.15
Browse files Browse the repository at this point in the history
Update shared:akka, shared:core, shared:fs2, ... to 1.3.15
  • Loading branch information
mergify[bot] authored Jul 6, 2023
2 parents 367c593 + a838066 commit cba6ac1
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 195 deletions.
20 changes: 2 additions & 18 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -147,13 +147,13 @@ val scalaTest = libraryDependencies ++= Seq("freespec", "funsuite", "flatspec",
"org.scalatest" %%% s"scalatest-$m" % "3.2.16" % Test
)

val zio1Version = "1.0.17"
val zio1Version = "1.0.18"
val zio2Version = "2.0.15"
val zio1InteropRsVersion = "1.3.12"
val zio2InteropRsVersion = "2.0.2"

val sttpModelVersion = "1.6.0"
val sttpSharedVersion = "1.3.13"
val sttpSharedVersion = "1.3.15"

val logback = "ch.qos.logback" % "logback-classic" % "1.4.8"

Expand Down Expand Up @@ -216,7 +216,6 @@ lazy val allAggregates = projectsWithOptionalNative ++
playJson.projectRefs ++
prometheusBackend.projectRefs ++
openTelemetryMetricsBackend.projectRefs ++
openTelemetryTracingZio1Backend.projectRefs ++
openTelemetryTracingZioBackend.projectRefs ++
finagleBackend.projectRefs ++
armeriaBackend.projectRefs ++
Expand Down Expand Up @@ -912,21 +911,6 @@ lazy val openTelemetryMetricsBackend = (projectMatrix in file("observability/ope
.jvmPlatform(scalaVersions = scala2 ++ scala3)
.dependsOn(core)

lazy val openTelemetryTracingZio1Backend = (projectMatrix in file("observability/opentelemetry-tracing-zio1-backend"))
.settings(commonJvmSettings)
.settings(
name := "opentelemetry-tracing-zio1-backend",
libraryDependencies ++= Seq(
"dev.zio" %% "zio-opentelemetry" % "1.0.0",
"org.scala-lang.modules" %% "scala-collection-compat" % "2.11.0",
"io.opentelemetry" % "opentelemetry-sdk-testing" % openTelemetryVersion % Test
),
scalaTest
)
.jvmPlatform(scalaVersions = scala2 ++ scala3)
.dependsOn(zio1 % compileAndTest)
.dependsOn(core)

lazy val openTelemetryTracingZioBackend = (projectMatrix in file("observability/opentelemetry-tracing-zio-backend"))
.settings(commonJvmSettings)
.settings(
Expand Down
15 changes: 7 additions & 8 deletions docs/backends/wrappers/opentelemetry.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@

Currently the following OpenTelemetry features are supported:

* metrics using `OpenTelemetryMetricsBackend`, wrapping any other backend
* tracing using `OpenTelemetryTracingZioBackend`, wrapping any ZIO1/ZIO2 backend
* tracing using [trace4cats](https://github.com/trace4cats/trace4cats), wrapping a cats-effect backend
- metrics using `OpenTelemetryMetricsBackend`, wrapping any other backend
- tracing using `OpenTelemetryTracingZioBackend`, wrapping any ZIO2 backend
- tracing using [trace4cats](https://github.com/trace4cats/trace4cats), wrapping a cats-effect backend

### Metrics

The backend depends only on [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-java). To use add the
The backend depends only on [opentelemetry-api](https://github.com/open-telemetry/opentelemetry-java). To use add the
following dependency to your project:

```
Expand All @@ -24,7 +24,7 @@ import sttp.client4.opentelemetry._
import io.opentelemetry.api.OpenTelemetry

// any effect and capabilities are supported
val sttpBackend: Backend[Future] = ???
val sttpBackend: Backend[Future] = ???
val openTelemetry: OpenTelemetry = ???

OpenTelemetryMetricsBackend(sttpBackend, openTelemetry)
Expand All @@ -38,7 +38,7 @@ import sttp.client4._
import sttp.client4.opentelemetry._
import io.opentelemetry.api.OpenTelemetry

val sttpBackend: Backend[Future] = ???
val sttpBackend: Backend[Future] = ???
val openTelemetry: OpenTelemetry = ???

OpenTelemetryMetricsBackend(
Expand All @@ -52,11 +52,10 @@ OpenTelemetryMetricsBackend(

### Tracing (ZIO)

To use, add the following dependency to your project (the `zio-*` modules depend on ZIO 2.x; for ZIO 1.x support, use `zio1-*`):
To use, add the following dependency to your project:

```
"com.softwaremill.sttp.client4" %% "opentelemetry-tracing-zio-backend" % "@VERSION@" // for ZIO 2.x
"com.softwaremill.sttp.client4" %% "opentelemetry-tracing-zio1-backend" % "@VERSION@" // for ZIO 1.x
```

This backend depends on [zio-opentelemetry](https://github.com/zio/zio-telemetry).
Expand Down

This file was deleted.

This file was deleted.

0 comments on commit cba6ac1

Please sign in to comment.