Merge branch 'main' into feat/allow-turning-off-auto-init-in-otel-agent

Author: adinauer

CHANGELOG.md

@@ -4,7 +4,10 @@
 
 ### Fixes
 
+- Clear window reference only on activity stop in profileMeasurements collector ([#2407](https://github.com/getsentry/sentry-java/pull/2407))
 - No longer disable OpenTelemetry exporters in default Java Agent config ([#2408](https://github.com/getsentry/sentry-java/pull/2408))
+- Fix `ClassNotFoundException` for `io.sentry.spring.SentrySpringServletContainerInitializer` in `sentry-spring-jakarta` ([#2411](https://github.com/getsentry/sentry-java/issues/2411))
+- Fix `sentry-samples-spring-jakarta` ([#2411](https://github.com/getsentry/sentry-java/issues/2411))
 
 ### Features
 

buildSrc/src/main/java/Config.kt

@@ -59,6 +59,7 @@ object Config {
         val androidxRecylerView = "androidx.recyclerview:recyclerview:1.2.1"
 
         val slf4jApi = "org.slf4j:slf4j-api:1.7.30"
+        val slf4jApi2 = "org.slf4j:slf4j-api:2.0.5"
         val slf4jJdk14 = "org.slf4j:slf4j-jdk14:1.7.30"
         val logbackVersion = "1.2.9"
         val logbackClassic = "ch.qos.logback:logback-classic:$logbackVersion"
@@ -67,6 +68,8 @@ object Config {
         val log4j2Api = "org.apache.logging.log4j:log4j-api:$log4j2Version"
         val log4j2Core = "org.apache.logging.log4j:log4j-core:$log4j2Version"
 
+        val jacksonDatabind = "com.fasterxml.jackson.core:jackson-databind"
+
         val springBootStarter = "org.springframework.boot:spring-boot-starter:$springBootVersion"
         val springBootStarterTest = "org.springframework.boot:spring-boot-starter-test:$springBootVersion"
         val springBootStarterWeb = "org.springframework.boot:spring-boot-starter-web:$springBootVersion"

sentry-android-core/src/main/java/io/sentry/android/core/internal/util/SentryFrameMetricsCollector.java

@@ -113,7 +113,10 @@ public void onActivityPaused(@NotNull Activity activity) {}
 
   @Override
   public void onActivityStopped(@NotNull Activity activity) {
-    clearCurrentWindow(activity.getWindow());
+    stopTrackingWindow(activity.getWindow());
+    if (currentWindow != null && currentWindow.get() == activity.getWindow()) {
+      currentWindow = null;
+    }
   }
 
   @Override
@@ -141,15 +144,12 @@ public void stopCollection(final @Nullable String listenerId) {
     }
     Window window = currentWindow != null ? currentWindow.get() : null;
     if (window != null && listenerMap.isEmpty()) {
-      clearCurrentWindow(window);
+      stopTrackingWindow(window);
     }
   }
 
   @SuppressLint("NewApi")
-  private void clearCurrentWindow(final @NotNull Window window) {
-    if (currentWindow != null && currentWindow.get() == window) {
-      currentWindow = null;
-    }
+  private void stopTrackingWindow(final @NotNull Window window) {
     if (trackedWindows.contains(window)) {
       if (buildInfoProvider.getSdkInfoVersion() >= Build.VERSION_CODES.N) {
         try {

sentry-android-core/src/test/java/io/sentry/android/core/internal/util/SentryFrameMetricsCollectorTest.kt

@@ -11,10 +11,12 @@ import io.sentry.ILogger
 import io.sentry.SentryOptions
 import io.sentry.android.core.BuildInfoProvider
 import io.sentry.test.getCtor
+import io.sentry.test.getProperty
 import org.junit.runner.RunWith
 import org.mockito.Mockito.spy
 import org.mockito.kotlin.mock
 import org.mockito.kotlin.whenever
+import java.lang.ref.WeakReference
 import kotlin.test.BeforeTest
 import kotlin.test.Test
 import kotlin.test.assertEquals
@@ -229,4 +231,24 @@ class SentryFrameMetricsCollectorTest {
         collector.stopCollection(id2)
         assertEquals(1, fixture.removeOnFrameMetricsAvailableListenerCounter)
     }
+
+    @Test
+    fun `collector removes current window only when last activity stops`() {
+        val collector = fixture.getSut(context)
+        val id1 = collector.startCollection(mock())
+        collector.onActivityStarted(fixture.activity)
+        collector.onActivityStarted(fixture.activity2)
+
+        // Stopping collecting data doesn't clear current tracked window reference
+        collector.stopCollection(id1)
+        assertNotNull(collector.getProperty<WeakReference<Window>?>("currentWindow"))
+
+        // Stopping first activity doesn't clear current tracked window reference
+        collector.onActivityStopped(fixture.activity)
+        assertNotNull(collector.getProperty<WeakReference<Window>?>("currentWindow"))
+
+        // Stopping last activity clears current tracked window reference
+        collector.onActivityStopped(fixture.activity2)
+        assertNull(collector.getProperty<WeakReference<Window>?>("currentWindow"))
+    }
 }

sentry-samples/sentry-samples-spring-jakarta/build.gradle.kts

@@ -34,13 +34,15 @@ dependencies {
     jakartaTransform("org.eclipse.transformer:org.eclipse.transformer.cli:0.5.0")
     jakartaTransform("org.eclipse.transformer:org.eclipse.transformer.jakarta:0.5.0")
 
-    implementation(Config.Libs.servletApi)
+    implementation(Config.Libs.servletApiJakarta)
     implementation(Config.Libs.springWeb)
     implementation(Config.Libs.springAop)
     implementation(Config.Libs.aspectj)
     implementation(Config.Libs.springSecurityWeb)
     implementation(Config.Libs.springSecurityConfig)
     implementation(Config.Libs.logbackClassic)
+    implementation(Config.Libs.slf4jApi2)
+    implementation(Config.Libs.jacksonDatabind)
     implementation(Config.Libs.kotlinReflect)
     implementation(kotlin(Config.kotlinStdLib, KotlinCompilerVersion.VERSION))
     implementation(projects.sentrySpringJakarta)

sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/SecurityConfiguration.java

@@ -4,6 +4,7 @@
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.crypto.factory.PasswordEncoderFactories;
@@ -12,6 +13,7 @@
 import org.springframework.security.web.SecurityFilterChain;
 
 @Configuration
+@EnableWebSecurity
 public class SecurityConfiguration {
 
   // this API is meant to be consumed by non-browser clients thus the CSRF protection is not needed.

sentry-samples/sentry-samples-spring-jakarta/src/main/java/io/sentry/samples/spring/jakarta/WebConfig.java

@@ -12,7 +12,7 @@
 
 @Configuration
 @EnableAspectJAutoProxy(proxyTargetClass = true)
-@ComponentScan("io.sentry.samples.spring.web")
+@ComponentScan("io.sentry.samples.spring.jakarta")
 @EnableWebMvc
 public class WebConfig {
 

sentry-spring-jakarta/src/main/resources/META-INF/services/jakarta.servlet.ServletContainerInitializer

@@ -1 +1 @@
-io.sentry.spring.SentrySpringServletContainerInitializer
+io.sentry.spring.jakarta.SentrySpringServletContainerInitializer