Alternate approach to handling okhttp/okhttp-jvm dependency

[trask]

Following @laurit's open-telemetry/opentelemetry-java-contrib#2094

Resolves #7678

[codecov]

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90.12%. Comparing base (567e737) to head (411f24a).
⚠️ Report is 6 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff            @@
##               main    #7681   +/-   ##
=========================================
  Coverage     90.12%   90.12%           
  Complexity     7183     7183           
=========================================
  Files           814      814           
  Lines         21675    21675           
  Branches       2123     2123           
=========================================
  Hits          19534    19534           
  Misses         1475     1475           
  Partials        666      666           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

• ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

[breedx-splk]

Approving, because it seems like it at least reduces the number of places that depend on okhttp-jvm....but does it actually really solve the problem in #7678 if the published pom still declares dependency on okhttp-jvm (like this example from contrib)???

[laurit]

Approving, because it seems like it at least reduces the number of places that depend on okhttp-jvm....but does it actually really solve the problem in #7678 if the published pom still declares dependency on okhttp-jvm (like this example from contrib)???

The idea behind this is that the gradle metadata in https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-opamp-client/1.49.0-alpha/opentelemetry-opamp-client-1.49.0-alpha.module points to okhttp not okhttp-jvm so gradle can choose the appropriate dependency. Since using just okhttp won't work with maven we change the dependency to okhttp-jvm in the published pom.

[jkwatson]

Can someone verify this works for Android builds?

[breedx-splk]

Approving, because it seems like it at least reduces the number of places that depend on okhttp-jvm....but does it actually really solve the problem in #7678 if the published pom still declares dependency on okhttp-jvm (like this example from contrib)???

The idea behind this is that the gradle metadata in https://repo1.maven.org/maven2/io/opentelemetry/contrib/opentelemetry-opamp-client/1.49.0-alpha/opentelemetry-opamp-client-1.49.0-alpha.module points to okhttp not okhttp-jvm so gradle can choose the appropriate dependency. Since using just okhttp won't work with maven we change the dependency to okhttp-jvm in the published pom.

OH thanks for that clarification...I always forget that modules exist in java. 🙈 That makes much more sense now.

[cbruegg]

@jkwatson I've checked out @trask's branch, ran publishToMavenLocal and updated from 1.52.0 to 1.55.0-SNAPSHOT in my Android project. Unlike with 1.53.0, the app built and ran fine. I confirmed with ./gradlew app:dependencies that Gradle really uses okhttp instead of okhttp-jvm:

|         |    |    +--- io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.55.0-SNAPSHOT
|         |    |    |    +--- io.opentelemetry:opentelemetry-exporter-common:1.55.0-SNAPSHOT (*)
|         |    |    |    +--- io.opentelemetry:opentelemetry-sdk-common:1.55.0-SNAPSHOT (*)
|         |    |    |    \--- com.squareup.okhttp3:okhttp:5.1.0 (*)

This matches 1.52.0 (which is working):

|         |    |    +--- io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.52.0
|         |    |    |    +--- io.opentelemetry:opentelemetry-exporter-common:1.52.0 (*)
|         |    |    |    +--- io.opentelemetry:opentelemetry-sdk-common:1.52.0 (*)
|         |    |    |    \--- com.squareup.okhttp3:okhttp:5.1.0 (*)

In contrast, this is what it looks like with 1.53.0 (which is not working):

|         |    |    +--- io.opentelemetry:opentelemetry-exporter-sender-okhttp:1.53.0
|         |    |    |    +--- io.opentelemetry:opentelemetry-exporter-common:1.53.0 (*)
|         |    |    |    +--- io.opentelemetry:opentelemetry-sdk-common:1.53.0 (*)
|         |    |    |    \--- com.squareup.okhttp3:okhttp-jvm:5.1.0

In summary, this PR indeed seems to resolve #7678. Thanks @trask, @jkwatson, @breedx-splk and @laurit for all your support!

[laurit]

OH thanks for that clarification...I always forget that modules exist in java. 🙈 That makes much more sense now.

it doesn't really have anything to do with java modules, gradle metadata uses .module extension.

[ColtonIdle]

Was this released in https://github.com/open-telemetry/opentelemetry-java/releases/tag/v1.55.0 ?

edit: looks like i didn't look close enough. does indeed seem to be the case. awesome!