From fed5e368f4481552101267d726166ea71dc9a315 Mon Sep 17 00:00:00 2001 From: Hugh Simpson Date: Mon, 16 Sep 2024 14:27:58 +0100 Subject: [PATCH 1/4] run tests for pekko 1.1 --- instrumentation/kamon-pekko/build.sbt | 66 +++++++++++++++++++++------ 1 file changed, 51 insertions(+), 15 deletions(-) diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index 5596992a1..bfd7004b1 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -3,21 +3,35 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version) )) +lazy val Pekko1_0Test = config("test-pekko-1.0") extend (Test) +lazy val Pekko1_1Test = config("test-pekko-1.1") extend (Test) -val pekkoVersion = "1.0.1" -libraryDependencies ++= { if(scalaBinaryVersion.value == "2.11") Seq.empty else Seq( - kanelaAgent % "provided", - scalatest % Test, - logbackClassic % Test, - "org.apache.pekko" %% "pekko-actor" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-slf4j" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-remote" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-cluster" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-cluster-sharding" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-protobuf" % pekkoVersion % "provided,test", - "org.apache.pekko" %% "pekko-testkit" % pekkoVersion % Test -)} +val pekko1_0_Version = "1.0.3" +val pekko1_1_Version = "1.1.1" +libraryDependencies ++= { + if (scalaBinaryVersion.value == "2.11") Seq.empty + else Seq( + kanelaAgent % "provided,test,test-pekko-1.0,test-pekko-1.1", + scalatest % "test,test-pekko-1.0,test-pekko-1.1", + logbackClassic % "test,test-pekko-1.0,test-pekko-1.1", + "org.apache.pekko" %% "pekko-actor" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-testkit" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-slf4j" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-remote" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-cluster" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-cluster-sharding" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-protobuf-v3" % pekko1_0_Version % "provided,test-pekko-1.0", + "org.apache.pekko" %% "pekko-testkit" % pekko1_0_Version % "test-pekko-1.0", + "org.apache.pekko" %% "pekko-actor" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-testkit" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-slf4j" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-remote" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-cluster" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-cluster-sharding" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-protobuf-v3" % pekko1_1_Version % "provided,test-pekko-1.1", + "org.apache.pekko" %% "pekko-testkit" % pekko1_1_Version % "test-pekko-1.1" + ) +} exportJars := true @@ -33,5 +47,27 @@ lazy val baseTestSettings = Seq( ) inConfig(Test)(Defaults.testSettings ++ instrumentationSettings ++ baseTestSettings ++ Seq( - crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version), + crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version) +)) + +configs(Pekko1_0Test, Pekko1_1Test) +inConfig(Pekko1_0Test)(Defaults.testSettings ++ Seq( + sources := (Test / sources).value, + unmanagedResourceDirectories ++= (Compile / unmanagedResourceDirectories).value, + unmanagedResourceDirectories ++= (Test / unmanagedResourceDirectories).value )) +inConfig(Pekko1_1Test)(Defaults.testSettings ++ Seq( + sources := (Test / sources).value, + unmanagedResourceDirectories ++= (Compile / unmanagedResourceDirectories).value, + unmanagedResourceDirectories ++= (Test / unmanagedResourceDirectories).value +)) + +Test / test := { + (Pekko1_0Test / test).value + (Pekko1_1Test / test).value +} +Test / testOnly := { + (Pekko1_0Test / testOnly).evaluated + + (Pekko1_1Test / testOnly).evaluated +} From 130db3b5c2c7fb40ef977bbd08485b963736f907 Mon Sep 17 00:00:00 2001 From: Hugh Simpson Date: Wed, 2 Oct 2024 08:32:04 +0100 Subject: [PATCH 2/4] use pekko nightly build --- instrumentation/kamon-pekko/build.sbt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index bfd7004b1..ead4ea16e 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -6,8 +6,9 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( lazy val Pekko1_0Test = config("test-pekko-1.0") extend (Test) lazy val Pekko1_1Test = config("test-pekko-1.1") extend (Test) -val pekko1_0_Version = "1.0.3" -val pekko1_1_Version = "1.1.1" +val pekko1_0_Version = "1.1.1+26-bc32e04b-SNAPSHOT" +val pekko1_1_Version = "1.0.3" +resolvers += "Apache Pekko Snapshots" at "https://repository.apache.org/content/groups/snapshots" libraryDependencies ++= { if (scalaBinaryVersion.value == "2.11") Seq.empty else Seq( From 972c74e648d8e3c6eb2abf4dfb392d7986076f76 Mon Sep 17 00:00:00 2001 From: Hugh Simpson Date: Thu, 10 Oct 2024 14:03:37 +0100 Subject: [PATCH 3/4] bump pekko-http version --- build.sbt | 16 ++++++++-------- instrumentation/kamon-pekko/build.sbt | 3 +-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build.sbt b/build.sbt index 8c4903931..d337b9db0 100644 --- a/build.sbt +++ b/build.sbt @@ -559,7 +559,7 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) `kamon-testkit` % "test" ) -lazy val pekkoHttpVersion = "1.0.0" +lazy val pekkoHttpVersion = "1.1.0" lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http")) .enablePlugins(JavaAgent) @@ -570,13 +570,13 @@ 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" % "1.1.2" % "provided", scalatest % "test", slf4jApi % "test", slf4jnop % "test", okHttp % "test", "org.apache.pekko" %% "pekko-http-testkit" % pekkoHttpVersion % "test", - "com.github.pjfanning" %% "pekko-http-json4s" % "2.0.0" % "test", + "com.github.pjfanning" %% "pekko-http-json4s" % "3.0.0" % "test", "org.json4s" %% "json4s-native" % "4.0.6" % "test", ), )).dependsOn(`kamon-pekko`, `kamon-testkit` % "test") @@ -592,12 +592,12 @@ 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" % "1.1.2" % "provided", + "org.apache.pekko" %% "pekko-discovery"% "1.1.2" % "provided", - "com.thesamet.scalapb" %% "scalapb-runtime" % "0.11.8" % "provided", - "org.apache.pekko" %% "pekko-grpc-runtime" % "1.0.0" % "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.1.0-M1" % "provided", + "io.grpc" % "grpc-stub" % "1.68.0" % "provided", scalatest % "test", diff --git a/instrumentation/kamon-pekko/build.sbt b/instrumentation/kamon-pekko/build.sbt index ead4ea16e..e92f577c6 100644 --- a/instrumentation/kamon-pekko/build.sbt +++ b/instrumentation/kamon-pekko/build.sbt @@ -6,9 +6,8 @@ inConfig(Compile)(Defaults.compileSettings ++ Seq( lazy val Pekko1_0Test = config("test-pekko-1.0") extend (Test) lazy val Pekko1_1Test = config("test-pekko-1.1") extend (Test) -val pekko1_0_Version = "1.1.1+26-bc32e04b-SNAPSHOT" +val pekko1_0_Version = "1.1.2" val pekko1_1_Version = "1.0.3" -resolvers += "Apache Pekko Snapshots" at "https://repository.apache.org/content/groups/snapshots" libraryDependencies ++= { if (scalaBinaryVersion.value == "2.11") Seq.empty else Seq( From f49cf6103f1c1bc2cd7f9136b8c160ef4593d6d3 Mon Sep 17 00:00:00 2001 From: Hugh Simpson Date: Fri, 11 Oct 2024 08:36:29 +0100 Subject: [PATCH 4/4] yay it works --- build.sbt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index d337b9db0..6fac3e7e2 100644 --- a/build.sbt +++ b/build.sbt @@ -559,13 +559,14 @@ lazy val `kamon-pekko` = (project in file("instrumentation/kamon-pekko")) `kamon-testkit` % "test" ) -lazy val pekkoHttpVersion = "1.1.0" +lazy val pekkoHttpVersion = "1.1.0+9-5427d0ca-SNAPSHOT" lazy val `kamon-pekko-http` = (project in file("instrumentation/kamon-pekko-http")) .enablePlugins(JavaAgent) .disablePlugins(AssemblyPlugin) .settings(instrumentationSettings) .settings(Seq( + resolvers += "Apache Pekko Snapshots" at "https://repository.apache.org/content/groups/snapshots", crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version), libraryDependencies ++= Seq( kanelaAgent % "provided", @@ -586,6 +587,7 @@ lazy val `kamon-pekko-grpc` = (project in file("instrumentation/kamon-pekko-grpc .disablePlugins(AssemblyPlugin) .settings(instrumentationSettings) .settings(Seq( + resolvers += "Apache Pekko Snapshots" at "https://repository.apache.org/content/groups/snapshots", PB.additionalDependencies := Seq.empty, crossScalaVersions := Seq(`scala_2.12_version`, `scala_2.13_version`, scala_3_version), libraryDependencies ++= Seq(