add sentry-okhttp module

.craft.yml

@@ -49,6 +49,7 @@ targets:
       maven:io.sentry:sentry-jdbc:
       maven:io.sentry:sentry-graphql:
       maven:io.sentry:sentry-quartz:
+      # maven:io.sentry:sentry-okhttp:
       maven:io.sentry:sentry-android-navigation:
       maven:io.sentry:sentry-compose:
       maven:io.sentry:sentry-compose-android:

.github/ISSUE_TEMPLATE/bug_report_java.yml

@@ -30,6 +30,7 @@ body:
         - sentry-quartz
         - sentry-openfeign
         - sentry-apache-http-client-5
+        - sentry-okhttp
         - other
     validations:
       required: true

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Add `sentry-okhttp` module to support instrumenting OkHttp in non-Android projects ([#3005](https://github.com/getsentry/sentry-java/pull/3005))
+  - This deprecates `sentry-android-okhttp` classes. Make sure to replace `io.sentry.android.okhttp` package name with `io.sentry.okhttp` before the next major, where the classes will be removed
+  - `SentryOkHttpUtils` was removed from public API as it's been exposed by mistake
+
 ## 7.0.0-rc.1
 
 ### Features

buildSrc/src/main/java/Config.kt

@@ -236,6 +236,7 @@ object Config {
         val SENTRY_SERVLET_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.servlet"
         val SENTRY_SERVLET_JAKARTA_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.servlet.jakarta"
         val SENTRY_COMPOSE_HELPER_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.compose.helper"
+        val SENTRY_OKHTTP_SDK_NAME = "$SENTRY_JAVA_SDK_NAME.okhttp"
         val group = "io.sentry"
         val description = "SDK for sentry.io"
         val versionNameProp = "versionName"

sentry-android-okhttp/api/sentry-android-okhttp.api

@@ -7,7 +7,6 @@ public final class io/sentry/android/okhttp/BuildConfig {
 }
 
 public final class io/sentry/android/okhttp/SentryOkHttpEventListener : okhttp3/EventListener {
-	public static final field Companion Lio/sentry/android/okhttp/SentryOkHttpEventListener$Companion;
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/IHub;Lkotlin/jvm/functions/Function1;)V
 	public synthetic fun <init> (Lio/sentry/IHub;Lkotlin/jvm/functions/Function1;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -48,9 +47,6 @@ public final class io/sentry/android/okhttp/SentryOkHttpEventListener : okhttp3/
 	public fun secureConnectStart (Lokhttp3/Call;)V
 }
 
-public final class io/sentry/android/okhttp/SentryOkHttpEventListener$Companion {
-}
-
 public final class io/sentry/android/okhttp/SentryOkHttpInterceptor : okhttp3/Interceptor {
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/IHub;)V
@@ -64,8 +60,3 @@ public abstract interface class io/sentry/android/okhttp/SentryOkHttpInterceptor
 	public abstract fun execute (Lio/sentry/ISpan;Lokhttp3/Request;Lokhttp3/Response;)Lio/sentry/ISpan;
 }
 
-public final class io/sentry/android/okhttp/SentryOkHttpUtils {
-	public static final field INSTANCE Lio/sentry/android/okhttp/SentryOkHttpUtils;
-	public final fun captureClientError (Lio/sentry/IHub;Lokhttp3/Request;Lokhttp3/Response;)V
-}
-

sentry-android-okhttp/build.gradle.kts

@@ -24,9 +24,7 @@ android {
 
     buildTypes {
         getByName("debug")
-        getByName("release") {
-            consumerProguardFiles("proguard-rules.pro")
-        }
+        getByName("release")
     }
 
     kotlinOptions {
@@ -63,6 +61,7 @@ kotlin {
 
 dependencies {
     api(projects.sentry)
+    api(projects.sentryOkhttp)
 
     compileOnly(Config.Libs.okhttp)