Merge branch 'main' into feat/apollo-v3

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## Unreleased
+
+### Features
+
+- Switch upstream dependencies to `compileOnly` in integrations ([#2175](https://github.com/getsentry/sentry-java/pull/2175))
+
+### Fixes
+
+- Lazily retrieve HostnameCache in MainEventProcessor ([#2170](https://github.com/getsentry/sentry-java/pull/2170))
+
 ## 6.2.1
 
 ### Fixes
@@ -50,6 +60,7 @@
 ### Fixes
 
 - Fix proguard rules to work R8 [issue](https://issuetracker.google.com/issues/235733922) around on AGP 7.3.0-betaX and 7.4.0-alphaX ([#2094](https://github.com/getsentry/sentry-java/pull/2094))
+- Fix GraalVM Native Image compatibility ([#2172](https://github.com/getsentry/sentry-java/pull/2172))
 
 ## 6.0.0
 

sentry-android-core/build.gradle.kts

@@ -49,7 +49,6 @@ android {
 
         // We run a full lint analysis as build part in CI, so skip vital checks for assemble tasks.
         checkReleaseBuilds = false
-        disable += "LogNotTimber"
     }
 
     // needed because of Kotlin 1.4.x
@@ -107,4 +106,6 @@ dependencies {
     testImplementation(projects.sentryTestSupport)
     testImplementation(projects.sentryAndroidFragment)
     testImplementation(projects.sentryAndroidTimber)
+    testRuntimeOnly(Config.Libs.timber)
+    testRuntimeOnly(Config.Libs.fragment)
 }

sentry-android-core/src/main/java/io/sentry/android/core/SentryAndroid.java

@@ -31,6 +31,10 @@ public final class SentryAndroid {
   static final String SENTRY_TIMBER_INTEGRATION_CLASS_NAME =
       "io.sentry.android.timber.SentryTimberIntegration";
 
+  private static final String TIMBER_CLASS_NAME = "timber.log.Timber";
+  private static final String FRAGMENT_CLASS_NAME =
+      "androidx.fragment.app.FragmentManager$FragmentLifecycleCallbacks";
+
   private SentryAndroid() {}
 
   /**
@@ -84,10 +88,17 @@ public static synchronized void init(
           OptionsContainer.create(SentryAndroidOptions.class),
           options -> {
             final LoadClass classLoader = new LoadClass();
+            final boolean isTimberUpstreamAvailable =
+                classLoader.isClassAvailable(TIMBER_CLASS_NAME, options);
+            final boolean isFragmentUpstreamAvailable =
+                classLoader.isClassAvailable(FRAGMENT_CLASS_NAME, options);
             final boolean isFragmentAvailable =
-                classLoader.isClassAvailable(SENTRY_FRAGMENT_INTEGRATION_CLASS_NAME, options);
+                (isFragmentUpstreamAvailable
+                    && classLoader.isClassAvailable(
+                        SENTRY_FRAGMENT_INTEGRATION_CLASS_NAME, options));
             final boolean isTimberAvailable =
-                classLoader.isClassAvailable(SENTRY_TIMBER_INTEGRATION_CLASS_NAME, options);
+                (isTimberUpstreamAvailable
+                    && classLoader.isClassAvailable(SENTRY_TIMBER_INTEGRATION_CLASS_NAME, options));
 
             AndroidOptionsInitializer.init(
                 options, context, logger, isFragmentAvailable, isTimberAvailable);

sentry-android-fragment/build.gradle.kts

@@ -66,9 +66,10 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    implementation(Config.Libs.fragment)
+    compileOnly(Config.Libs.fragment)
 
     // tests
+    testImplementation(Config.Libs.fragment)
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)
     testImplementation(Config.TestLibs.mockitoInline)

sentry-android-okhttp/build.gradle.kts

@@ -68,12 +68,14 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    implementation(Config.Libs.okhttpBom)
-    implementation(Config.Libs.okhttp)
+    compileOnly(Config.Libs.okhttpBom)
+    compileOnly(Config.Libs.okhttp)
 
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     // tests
+    testImplementation(Config.Libs.okhttpBom)
+    testImplementation(Config.Libs.okhttp)
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.androidxJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)

sentry-android-timber/build.gradle.kts

@@ -71,11 +71,12 @@ kotlin {
 dependencies {
     api(projects.sentry)
 
-    api(Config.Libs.timber)
+    compileOnly(Config.Libs.timber)
 
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
 
     // tests
+    testImplementation(Config.Libs.timber)
     testImplementation(Config.TestLibs.kotlinTestJunit)
     testImplementation(Config.TestLibs.androidxJunit)
     testImplementation(Config.TestLibs.mockitoKotlin)

sentry-samples/sentry-samples-android/build.gradle.kts

@@ -111,6 +111,7 @@ dependencies {
     implementation(projects.sentryAndroidTimber)
     implementation(projects.sentryCompose)
     implementation(Config.Libs.fragment)
+    implementation(Config.Libs.timber)
 
 //    how to exclude androidx if release health feature is disabled
 //    implementation(projects.sentryAndroid) {

sentry/src/main/java/io/sentry/MainEventProcessor.java

@@ -31,16 +31,10 @@ public final class MainEventProcessor implements EventProcessor, Closeable {
   private final @NotNull SentryOptions options;
   private final @NotNull SentryThreadFactory sentryThreadFactory;
   private final @NotNull SentryExceptionFactory sentryExceptionFactory;
-  private final @Nullable HostnameCache hostnameCache;
+  private volatile @Nullable HostnameCache hostnameCache = null;
 
   public MainEventProcessor(final @NotNull SentryOptions options) {
-    this(options, options.isAttachServerName() ? HostnameCache.getInstance() : null);
-  }
-
-  MainEventProcessor(
-      final @NotNull SentryOptions options, final @Nullable HostnameCache hostnameCache) {
     this.options = Objects.requireNonNull(options, "The SentryOptions is required.");
-    this.hostnameCache = hostnameCache;
 
     final SentryStackTraceFactory sentryStackTraceFactory =
         new SentryStackTraceFactory(
@@ -53,14 +47,12 @@ public MainEventProcessor(final @NotNull SentryOptions options) {
   MainEventProcessor(
       final @NotNull SentryOptions options,
       final @NotNull SentryThreadFactory sentryThreadFactory,
-      final @NotNull SentryExceptionFactory sentryExceptionFactory,
-      final @NotNull HostnameCache hostnameCache) {
+      final @NotNull SentryExceptionFactory sentryExceptionFactory) {
     this.options = Objects.requireNonNull(options, "The SentryOptions is required.");
     this.sentryThreadFactory =
         Objects.requireNonNull(sentryThreadFactory, "The SentryThreadFactory is required.");
     this.sentryExceptionFactory =
         Objects.requireNonNull(sentryExceptionFactory, "The SentryExceptionFactory is required.");
-    this.hostnameCache = Objects.requireNonNull(hostnameCache, "The HostnameCache is required");
   }
 
   @Override
@@ -164,8 +156,21 @@ private void setServerName(final @NotNull SentryBaseEvent event) {
       event.setServerName(options.getServerName());
     }
 
-    if (options.isAttachServerName() && hostnameCache != null && event.getServerName() == null) {
-      event.setServerName(hostnameCache.getHostname());
+    if (options.isAttachServerName() && event.getServerName() == null) {
+      ensureHostnameCache();
+      if (hostnameCache != null) {
+        event.setServerName(hostnameCache.getHostname());
+      }
+    }
+  }
+
+  private void ensureHostnameCache() {
+    if (hostnameCache == null) {
+      synchronized (this) {
+        if (hostnameCache == null) {
+          hostnameCache = HostnameCache.getInstance();
+        }
+      }
     }
   }