Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove jaeger exporter and update opentelemetry #415

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Remove jaeger exporter and update opentelemetry #415

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aee3942
bump otel, remove jaeger exporter
Sep 24, 2024
022bdfa
remove jaeger exporter module
Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:
run: docker-compose down

- name: Compress target directories
run: tar cf targets.tar target modules/opentelemetry-otlp-http-exporter/target modules/opentelemetry-common/target modules/opentelemetry-otlp-http4s-grpc-exporter/target modules/opentelemetry-otlp-grpc-exporter/target modules/opentelemetry-jaeger-exporter/target project/target
run: tar cf targets.tar target modules/opentelemetry-otlp-http-exporter/target modules/opentelemetry-common/target modules/opentelemetry-otlp-http4s-grpc-exporter/target modules/opentelemetry-otlp-grpc-exporter/target project/target

- name: Upload target directories
uses: actions/upload-artifact@v2
Expand Down
11 changes: 0 additions & 11 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ lazy val root = (project in file("."))
.settings(name := "Trace4Cats OpenTelemetry")
.aggregate(
`opentelemetry-common`,
`opentelemetry-jaeger-exporter`,
`opentelemetry-otlp-grpc-exporter`,
`opentelemetry-otlp-http-exporter`,
`opentelemetry-otlp-http4s-grpc-exporter`
Expand All @@ -55,16 +54,6 @@ lazy val `opentelemetry-common` =
)
)

lazy val `opentelemetry-jaeger-exporter` =
(project in file("modules/opentelemetry-jaeger-exporter"))
.settings(publishSettings)
.settings(
name := "trace4cats-opentelemetry-jaeger-exporter",
libraryDependencies ++= Seq(Dependencies.openTelemetryJaegerExporter),
libraryDependencies ++= Seq(Dependencies.grpcOkHttp, Dependencies.trace4catsJaegerIntegrationTest).map(_ % Test)
)
.dependsOn(`opentelemetry-common`)

lazy val `opentelemetry-otlp-grpc-exporter` =
(project in file("modules/opentelemetry-otlp-grpc-exporter"))
.settings(publishSettings)
Expand Down
23 changes: 0 additions & 23 deletions ...ter/src/main/scala/trace4cats/opentelemetry/jaeger/OpenTelemetryJaegerSpanCompleter.scala
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ...rter/src/main/scala/trace4cats/opentelemetry/jaeger/OpenTelemetryJaegerSpanExporter.scala
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions modules/opentelemetry-jaeger-exporter/src/test/resources/logback.xml
View file
Open in desktop

This file was deleted.

38 changes: 0 additions & 38 deletions ...src/test/scala/trace4cats/opentelemetry/jaeger/OpenTelemetryJaegerSpanCompleterSpec.scala
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions .../src/test/scala/trace4cats/opentelemetry/jaeger/OpenTelemetryJaegerSpanExporterSpec.scala
View file
Open in desktop

This file was deleted.

36 changes: 0 additions & 36 deletions ...pentelemetry-jaeger-exporter/src/test/scala/trace4cats/opentelemetry/jaeger/package.scala
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions project/Dependencies.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ object Dependencies {
val collectionCompat = "2.11.0"
val grpc = "1.49.2"
val http4s = "0.23.25"
val openTelemetry = "1.27.0"
val openTelemetry = "1.42.1"

val kindProjector = "0.13.2"
val betterMonadicFor = "0.3.1"
Expand All @@ -35,7 +35,6 @@ object Dependencies {
lazy val http4sCirce = "org.http4s" %% "http4s-circe" % Versions.http4s
lazy val openTelemetrySdk = "io.opentelemetry" % "opentelemetry-sdk" % Versions.openTelemetry
lazy val openTelemetryOtlpExporter = "io.opentelemetry" % "opentelemetry-exporter-otlp" % Versions.openTelemetry
lazy val openTelemetryJaegerExporter = "io.opentelemetry" % "opentelemetry-exporter-jaeger" % Versions.openTelemetry

lazy val kindProjector = ("org.typelevel" % "kind-projector" % Versions.kindProjector).cross(CrossVersion.full)
lazy val betterMonadicFor = "com.olegpy" %% "better-monadic-for" % Versions.betterMonadicFor
Expand Down