From 6adb55c55baa69c4ff69e75998996885bde11be8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Gajowy?= Date: Tue, 12 Apr 2022 16:10:02 +0200 Subject: [PATCH 1/2] Minor cleanup and updates --- build.sbt | 6 ++++++ project/Dependencies.scala | 4 ---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 82d6ad58f..40d7ade73 100644 --- a/build.sbt +++ b/build.sbt @@ -19,6 +19,12 @@ inThisBuild( "Piotr Jósiak", "piotr.josiak@gmail.com", url("https://github.com/worekleszczy") + ), + Developer( + "lgajowy", + "Łukasz Gajowy", + "lukasz.gajowy@gmail.com", + url("https://github.com/lgajowy") ) ), scalacOptions ++= Seq("-deprecation", "-feature"), diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 32d0f13ce..799698035 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -72,10 +72,6 @@ object Dependencies { val akkaMultiNodeTestKit = Seq("com.typesafe.akka" %% "akka-multi-node-testkit" % AkkaVersion % Test) - val slf4jApi = Seq("org.slf4j" % "slf4j-api" % "1.7.33") - - val reflection: String => Seq[ModuleID] = version => Seq("org.scala-lang" % "scala-reflect" % version) - val exampleDependencies = Seq( "io.circe" %% "circe-core" % CirceVersion, "io.circe" %% "circe-generic" % CirceVersion, From b0acf7b06071fd9c62075e9f8d4fbac16e4435fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Gajowy?= Date: Tue, 12 Apr 2022 16:11:33 +0200 Subject: [PATCH 2/2] Publish fat jar along with the other artifacts --- README.md | 5 ++--- build.sbt | 13 ++++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 540d3002a..9d0aafd41 100644 --- a/README.md +++ b/README.md @@ -38,12 +38,11 @@ Add this entry to your `application.conf`: ### OpenTelemetry Extension: -Download the latest OTEL Extension jar from https://github.com/ScalaConsultants/mesmer/releases and add a parameter when -running your JVM: +Download the latest OTEL Extension fat jar from Maven repository and add a parameter when running your JVM: ``` java -javaagent:opentelemetry-javaagent110.jar \ -- this is the OpenTelemetry Agent - -Dotel.javaagent.extensions=mesmer-otel-extension.jar -- this is our OTEL Agent Extension + -Dotel.javaagent.extensions=mesmer-otel-extension-assembly.jar -- this is our OTEL Agent Extension fat jar ``` ### Exporter: diff --git a/build.sbt b/build.sbt index 40d7ade73..bf2bc9479 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,7 @@ import Dependencies._ -import sbt.Package.{ MainClass, ManifestAttributes } + + +lazy val scala213 = "2.13" inThisBuild( List( @@ -92,7 +94,7 @@ lazy val otelExtension = (project in file("otel-extension")) scalatest }, assembly / test := {}, - assembly / assemblyJarName := "mesmer-otel-extension.jar", + assembly / assemblyJarName := s"${name.value}_${scalaBinaryVersion.value}-${version.value}-assembly.jar", assemblyMergeStrategySettings, Test / fork := true, Test / parallelExecution := true, @@ -101,7 +103,12 @@ lazy val otelExtension = (project in file("otel-extension")) Tests.Group(name = test.name, tests = Seq(test), runPolicy = group.runPolicy) } }), - Test / testOnly / testGrouping := (Test / testGrouping).value + Test / testOnly / testGrouping := (Test / testGrouping).value, + assembly / artifact := { + val art = (assembly / artifact).value + art.withClassifier(Some("assembly")) + }, + addArtifact(assembly / artifact, assembly) ) .dependsOn(core % "provided->compile;test->test;compile->compile")