Alternate approach to handling okhttp/okhttp-jvm dependency (#7681)

Author: trask

buildSrc/src/main/kotlin/otel.publish-conventions.gradle.kts

@@ -32,6 +32,17 @@ publishing {
         name.set("OpenTelemetry Java")
         url.set("https://github.com/open-telemetry/opentelemetry-java")
 
+        withXml {
+          // Since 5.0 okhttp uses gradle metadata to choose either okhttp-jvm or okhttp-android.
+          // This does not work for maven builds that don't understand gradle metadata. They end up
+          // using the okhttp artifact that is an empty jar. Here we replace usages of okhttp with
+          // okhttp-jvm so that maven could get the actual okhttp dependency instead of the empty jar.
+          var result = asString()
+          var modified = result.toString().replace(">okhttp<", ">okhttp-jvm<")
+          result.clear()
+          result.append(modified)
+        }
+
         licenses {
           license {
             name.set("The Apache License, Version 2.0")

dependencyManagement/build.gradle.kts

@@ -73,7 +73,7 @@ val DEPENDENCIES = listOf(
   "com.google.code.findbugs:jsr305:3.0.2",
   "com.google.guava:guava-beta-checker:1.0",
   "com.sun.net.httpserver:http:20070405",
-  "com.squareup.okhttp3:okhttp-jvm:$okhttpVersion",
+  "com.squareup.okhttp3:okhttp:$okhttpVersion",
   "com.tngtech.archunit:archunit-junit5:1.4.1",
   "com.uber.nullaway:nullaway:0.12.10",
   "edu.berkeley.cs.jqf:jqf-fuzz:1.7", // jqf-fuzz version 1.8+ requires Java 11+

exporters/otlp/all/build.gradle.kts

@@ -34,7 +34,7 @@ dependencies {
   jmhImplementation("com.linecorp.armeria:armeria")
   jmhImplementation("com.linecorp.armeria:armeria-grpc")
   jmhImplementation("io.opentelemetry.proto:opentelemetry-proto")
-  jmhRuntimeOnly("com.squareup.okhttp3:okhttp-jvm")
+  jmhRuntimeOnly("com.squareup.okhttp3:okhttp")
   jmhRuntimeOnly("io.grpc:grpc-netty")
 }
 
@@ -64,12 +64,8 @@ testing {
               }
             }
           }
-          if (it.equals("LATEST")) {
-            implementation("com.squareup.okhttp3:okhttp-jvm")
-          } else {
-            implementation("com.squareup.okhttp3:okhttp")
-          }
 
+          implementation("com.squareup.okhttp3:okhttp")
           implementation("io.grpc:grpc-stub")
         }
 

exporters/otlp/testing-internal/build.gradle.kts

@@ -27,7 +27,7 @@ dependencies {
 
   api("io.opentelemetry.proto:opentelemetry-proto")
   api("org.junit.jupiter:junit-jupiter-api")
-  implementation("com.squareup.okhttp3:okhttp-jvm")
+  implementation("com.squareup.okhttp3:okhttp")
   implementation("org.junit.jupiter:junit-jupiter-params")
 
   implementation("com.linecorp.armeria:armeria-grpc-protocol")

exporters/sender/okhttp/build.gradle.kts

@@ -12,7 +12,7 @@ dependencies {
   implementation(project(":exporters:common"))
   implementation(project(":sdk:common"))
 
-  implementation("com.squareup.okhttp3:okhttp-jvm")
+  implementation("com.squareup.okhttp3:okhttp")
 
   compileOnly("io.grpc:grpc-stub")
   compileOnly("com.fasterxml.jackson.core:jackson-core")

sdk-extensions/jaeger-remote-sampler/build.gradle.kts

@@ -20,7 +20,7 @@ dependencies {
   implementation(project(":exporters:common"))
   implementation(project(":exporters:sender:okhttp"))
 
-  implementation("com.squareup.okhttp3:okhttp-jvm")
+  implementation("com.squareup.okhttp3:okhttp")
 
   compileOnly("io.grpc:grpc-api")
   compileOnly("io.grpc:grpc-protobuf")