From 13acd599f7ef70e7f1b8e9502d3d642ef516ded4 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:04:39 +0100 Subject: [PATCH 1/5] latest stable pekko releases --- build.sbt | 14 +++++++------- instrumentation/kamon-pekko/build.sbt | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.sbt b/build.sbt index 0af2d9bf9..abc3e67bd 100644 --- a/build.sbt +++ b/build.sbt @@ -542,6 +542,8 @@ lazy val `kamon-akka-http` = (project in file("instrumentation/kamon-akka-http") .dependsOn(`kamon-akka`, `kamon-testkit` % "test") +lazy val pekkoVersion = "1.0.3" +lazy val pekkoHttpVersion = "1.0.1" lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) .enablePlugins(JavaAgent) @@ -550,7 +552,7 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) .settings(Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version), libraryDependencies ++= Seq( - "org.apache.pekko" %% "pekko-actor" % "1.0.1" % "provided" + "org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided" ) )) .dependsOn( @@ -558,8 +560,6 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) `kamon-testkit` % "test" ) -lazy val pekkoHttpVersion = "1.0.0" - lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http")) .enablePlugins(JavaAgent) .disablePlugins(AssemblyPlugin) @@ -569,7 +569,7 @@ lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http libraryDependencies ++= Seq( kanelaAgent % "provided", "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided", - "org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided", + "org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided", scalatest % "test", slf4jApi % "test", slf4jnop % "test", @@ -591,11 +591,11 @@ lazy val `kamon-pekko-grpc` = (project in file("instrumentation/kamon-pekko-grpc kanelaAgent % "provided", "org.apache.pekko" %% "pekko-http" % pekkoHttpVersion % "provided", - "org.apache.pekko" %% "pekko-stream" % "1.0.1" % "provided", - "org.apache.pekko" %% "pekko-discovery"% "1.0.0" % "provided", + "org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided", + "org.apache.pekko" %% "pekko-discovery"% pekkoVersion % "provided", "com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.8" % "provided", - "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.0" % "provided", + "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.2" % "provided", "io.grpc" % "grpc-stub" % "1.43.2" % "provided", diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index 5596992a1..c9ce3902c 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -4,7 +4,7 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version) )) -val pekkoVersion = "1.0.1" +val pekkoVersion = "1.0.3" libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq( kanelaAgent % "provided", scalatest % Test, From 9bdc253e72900efcd2942efa18fe198c0d2803be Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:06:44 +0100 Subject: [PATCH 2/5] Update plugins.sbt --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4ae8d45fc..c51a15746 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -15,4 +15,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3") -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.0") +addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2") From 24003844e8ca5da2cb57fa9d019b634f3ebac580 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:23:30 +0100 Subject: [PATCH 3/5] Update plugins.sbt --- project/plugins.sbt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/project/plugins.sbt b/project/plugins.sbt index c51a15746..df7059a4b 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,3 +1,6 @@ +// needed due to dependency convergence issues +libraryDependencySchemes += "org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always + addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.31") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.10") From 5aebb9ee0085c012aec5179a4b9d7060f0733419 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:08:52 +0100 Subject: [PATCH 4/5] test with Pekko 1.1.0-M1 --- build.sbt | 4 ++-- instrumentation/kamon-pekko/build.sbt | 2 +- project/plugins.sbt | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index abc3e67bd..2ac495780 100644 --- a/build.sbt +++ b/build.sbt @@ -542,8 +542,8 @@ lazy val `kamon-akka-http` = (project in file("instrumentation/kamon-akka-http") .dependsOn(`kamon-akka`, `kamon-testkit` % "test") -lazy val pekkoVersion = "1.0.3" -lazy val pekkoHttpVersion = "1.0.1" +lazy val pekkoVersion = "1.1.0-M1" +lazy val pekkoHttpVersion = "1.1.0-M1" lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) .enablePlugins(JavaAgent) diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index c9ce3902c..7fd90f578 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -4,7 +4,7 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version) )) -val pekkoVersion = "1.0.3" +val pekkoVersion = "1.1.0-M1" libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq( kanelaAgent % "provided", scalatest % Test, diff --git a/project/plugins.sbt b/project/plugins.sbt index df7059a4b..04a4da030 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -18,4 +18,4 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.5.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") addSbtPlugin("com.lightbend.akka.grpc" % "sbt-akka-grpc" % "2.1.3") -addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.0.2") +addSbtPlugin("org.apache.pekko" % "pekko-grpc-sbt-plugin" % "1.1.0-M1") From 17940b2d6da2e7e801f50457bc32229a9f7b8727 Mon Sep 17 00:00:00 2001 From: PJ Fanning Date: Fri, 26 Jul 2024 14:12:39 +0100 Subject: [PATCH 5/5] update protobuf related dependencies --- build.sbt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 2ac495780..4aeb69c36 100644 --- a/build.sbt +++ b/build.sbt @@ -594,9 +594,9 @@ lazy val `kamon-pekko-grpc` = (project in file("instrumentation/kamon-pekko-grpc "org.apache.pekko" %% "pekko-stream" % pekkoVersion % "provided", "org.apache.pekko" %% "pekko-discovery"% pekkoVersion % "provided", - "com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.8" % "provided", - "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.2" % "provided", - "io.grpc" % "grpc-stub" % "1.43.2" % "provided", + "com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.17" % "provided", + "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.2" % "provided", + "io.grpc" % "grpc-stub" % "1.65.1" % "provided", scalatest % "test",