⬆️ upgrade otel and slf4j (#358)

hypertrace · Jan 28, 2022 · 8660835 · 8660835
1 parent d94a530
commit 8660835
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -34,13 +34,13 @@ subprojects {
     extra.set("versions", mapOf(
             // when updating these values, some values must also be updated in buildSrc as this map
             // cannot be accessed there
-            "opentelemetry" to "1.10.0",
+            "opentelemetry" to "1.10.1",
             "opentelemetry_proto" to "0.11.0-alpha",
-            "opentelemetry_java_agent" to "1.10.0-alpha",
-            "opentelemetry_java_agent_all" to "1.10.0",
-            "opentelemetry_gradle_plugin" to "1.10.0-alpha",
+            "opentelemetry_java_agent" to "1.10.1-alpha",
+            "opentelemetry_java_agent_all" to "1.10.1",
+            "opentelemetry_gradle_plugin" to "1.10.1-alpha",
             "byte_buddy" to "1.12.6",
-                "slf4j" to "1.7.30"
+                "slf4j" to "1.7.32"
     ))
 
     apply<JavaPlugin>()

diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -27,7 +27,7 @@ repositories {
 dependencies {
   implementation(gradleApi())
   implementation(localGroovy())
-  val otelInstrumentationVersion = "1.10.0-alpha"
+  val otelInstrumentationVersion = "1.10.1-alpha"
   implementation("io.opentelemetry.javaagent:opentelemetry-muzzle:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-generation:io.opentelemetry.instrumentation.muzzle-generation.gradle.plugin:$otelInstrumentationVersion")
   implementation("io.opentelemetry.instrumentation.muzzle-check:io.opentelemetry.instrumentation.muzzle-check.gradle.plugin:$otelInstrumentationVersion")

diff --git a/...dSrc/src/main/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java b/...dSrc/src/main/java/io/opentelemetry/instrumentation/gradle/AutoInstrumentationPlugin.java
@@ -54,7 +54,7 @@ private void addDependencies(Project project) {
     @SuppressWarnings("unchecked") final Map<String, String> versions = Objects.requireNonNull(
         (Map<String, String>) project.getExtensions().getExtraProperties().get("versions"));
 
-    dependencies.add("implementation", "org.slf4j:slf4j-api:1.7.30");
+    dependencies.add("implementation", "org.slf4j:slf4j-api:" + versions.get("slf4j"));
     dependencies.add("compileOnly", "com.google.auto.service:auto-service-annotations:1.0");
     dependencies.add("annotationProcessor", "com.google.auto.service:auto-service:1.0");
     dependencies.add("implementation", "net.bytebuddy:byte-buddy-dep:" + versions.get("byte_buddy"));