Merge branch 'main' into markushi/fix/determine-app-start-type-via-content-provider-main

Author: markushi

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ### Fixes
 
+- Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4250](https://github.com/getsentry/sentry-java/pull/4250))
+
+## 8.4.0
+
+### Fixes
+
 - The SDK now handles `null` on many APIs instead of expecting a non `null` value ([#4245](https://github.com/getsentry/sentry-java/pull/4245))
   - Certain APIs like `setTag`, `setData`, `setExtra`, `setContext` previously caused a `NullPointerException` when invoked with either `null` key or value.
   - The SDK now tries to have a sane fallback when `null` is passed and no longer throws `NullPointerException`
@@ -13,7 +19,15 @@
 - Add support for setting in-app-includes/in-app-excludes via AndroidManifest.xml ([#4240](https://github.com/getsentry/sentry-java/pull/4240))
 - Modifications to OkHttp requests are now properly propagated to the affected span / breadcrumbs ([#4238](https://github.com/getsentry/sentry-java/pull/4238))
   - Please ensure the SentryOkHttpInterceptor is added last to your OkHttpClient, as otherwise changes to the `Request`  by subsequent interceptors won't be considered
-- Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4250](https://github.com/getsentry/sentry-java/pull/4250))
+- Fix "class ch.qos.logback.classic.spi.ThrowableProxyVO cannot be cast to class ch.qos.logback.classic.spi.ThrowableProxy" ([#4206](https://github.com/getsentry/sentry-java/pull/4206))
+  - In this case we cannot report the `Throwable` to Sentry as it's not available
+  - If you are using OpenTelemetry v1 `OpenTelemetryAppender`, please consider upgrading to v2
+- Pass OpenTelemetry span attributes into TracesSampler callback ([#4253](https://github.com/getsentry/sentry-java/pull/4253))
+  - `SamplingContext` now has a `getAttribute` method that grants access to OpenTelemetry span attributes via their String key (e.g. `http.request.method`)
+- Fix AbstractMethodError when using SentryTraced for Jetpack Compose ([#4255](https://github.com/getsentry/sentry-java/pull/4255))
+- Assume `http.client` for span `op` if not a root span ([#4257](https://github.com/getsentry/sentry-java/pull/4257))
+- Avoid unnecessary copies when using `CopyOnWriteArrayList` ([#4247](https://github.com/getsentry/sentry-java/pull/4247))
+  - This affects in particular `SentryTracer.getLatestActiveSpan` which would have previously copied all child span references. This may have caused `OutOfMemoryError` on certain devices due to high frequency of calling the method.
 
 ### Features
 
@@ -477,6 +491,24 @@ If you have been using `8.0.0-rc.4` of the Java SDK, here's the new changes that
     - We are planning to improve this in the future but opted for this fix first.
 - Fix swallow NDK loadLibrary errors ([#4082](https://github.com/getsentry/sentry-java/pull/4082))
 
+## 7.22.1
+
+### Fixes
+
+- Fix Ensure app start type is set, even when ActivityLifecycleIntegration is not running ([#4216](https://github.com/getsentry/sentry-java/pull/4216))
+- Fix properly reset application/content-provider timespans for warm app starts ([#4244](https://github.com/getsentry/sentry-java/pull/4244))
+
+## 7.22.0
+
+### Fixes
+
+- Session Replay: Fix various crashes and issues ([#4135](https://github.com/getsentry/sentry-java/pull/4135))
+    - Fix `FileNotFoundException` when trying to read/write `.ongoing_segment` file
+    - Fix `IllegalStateException` when registering `onDrawListener`
+    - Fix SIGABRT native crashes on Motorola devices when encoding a video
+- (Jetpack Compose) Modifier.sentryTag now uses Modifier.Node ([#4029](https://github.com/getsentry/sentry-java/pull/4029))
+    - This allows Composables that use this modifier to be skippable
+
 ## 7.21.0
 
 ### Fixes

gradle.properties

@@ -14,7 +14,7 @@ org.gradle.workers.max=2
 android.useAndroidX=true
 
 # Release information
-versionName=8.3.0
+versionName=8.4.0
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

sentry-compose/src/androidMain/kotlin/io/sentry/compose/SentryModifier.kt

@@ -51,6 +51,12 @@ public object SentryModifier {
         Modifier.Node(),
         SemanticsModifierNode {
 
+        override val shouldClearDescendantSemantics: Boolean
+            get() = false
+
+        override val shouldMergeDescendantSemantics: Boolean
+            get() = false
+
         override fun SemanticsPropertyReceiver.applySemantics() {
             this[SentryTag] = tag
         }

sentry-logback/src/main/java/io/sentry/logback/SentryAppender.java

@@ -110,14 +110,16 @@ protected void append(@NotNull ILoggingEvent eventObject) {
     event.setLogger(loggingEvent.getLoggerName());
     event.setLevel(formatLevel(loggingEvent.getLevel()));
 
-    final ThrowableProxy throwableInformation = (ThrowableProxy) loggingEvent.getThrowableProxy();
-    if (throwableInformation != null) {
-      final Mechanism mechanism = new Mechanism();
-      mechanism.setType(MECHANISM_TYPE);
-      final Throwable mechanismException =
-          new ExceptionMechanismException(
-              mechanism, throwableInformation.getThrowable(), Thread.currentThread());
-      event.setThrowable(mechanismException);
+    if (loggingEvent.getThrowableProxy() instanceof ThrowableProxy) {
+      final ThrowableProxy throwableInformation = (ThrowableProxy) loggingEvent.getThrowableProxy();
+      if (throwableInformation != null) {
+        final Mechanism mechanism = new Mechanism();
+        mechanism.setType(MECHANISM_TYPE);
+        final Throwable mechanismException =
+            new ExceptionMechanismException(
+                mechanism, throwableInformation.getThrowable(), Thread.currentThread());
+        event.setThrowable(mechanismException);
+      }
     }
 
     if (loggingEvent.getThreadName() != null) {

sentry-logback/src/test/kotlin/io/sentry/logback/SentryAppenderTest.kt

@@ -4,6 +4,9 @@ import ch.qos.logback.classic.Level
 import ch.qos.logback.classic.LoggerContext
 import ch.qos.logback.classic.encoder.PatternLayoutEncoder
 import ch.qos.logback.classic.spi.ILoggingEvent
+import ch.qos.logback.classic.spi.LoggingEvent
+import ch.qos.logback.classic.spi.LoggingEventVO
+import ch.qos.logback.classic.spi.ThrowableProxy
 import ch.qos.logback.core.encoder.Encoder
 import ch.qos.logback.core.encoder.EncoderBase
 import ch.qos.logback.core.status.Status
@@ -536,4 +539,24 @@ class SentryAppenderTest {
         assertTrue(Sentry.isEnabled())
         System.clearProperty("sentry.dsn")
     }
+
+    @Test
+    fun `does not crash on ThrowableProxyVO`() {
+        fixture = Fixture()
+        val throwableProxy = ThrowableProxy(RuntimeException("hello proxy throwable"))
+        val loggingEvent = LoggingEvent()
+        loggingEvent.level = Level.ERROR
+        loggingEvent.setThrowableProxy(throwableProxy)
+        val loggingEventVO = LoggingEventVO.build(loggingEvent)
+
+        fixture.appender.append(loggingEventVO)
+
+        verify(fixture.transport).send(
+            checkEvent { event ->
+                assertEquals(SentryLevel.ERROR, event.level)
+                assertNull(event.exceptions)
+            },
+            anyOrNull()
+        )
+    }
 }

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SentrySampler.java

@@ -23,7 +23,9 @@
 import io.sentry.TransactionContext;
 import io.sentry.clientreport.DiscardReason;
 import io.sentry.protocol.SentryId;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,13 +66,15 @@ public SamplingResult shouldSample(
       if (samplingDecision != null) {
         return new SentrySamplingResult(samplingDecision);
       } else {
-        return handleRootOtelSpan(traceId, parentContext);
+        return handleRootOtelSpan(traceId, parentContext, attributes);
       }
     }
   }
 
   private @NotNull SamplingResult handleRootOtelSpan(
-      final @NotNull String traceId, final @NotNull Context parentContext) {
+      final @NotNull String traceId,
+      final @NotNull Context parentContext,
+      final @NotNull Attributes attributes) {
     if (!scopes.getOptions().isTracingEnabled()) {
       return SamplingResult.create(SamplingDecision.RECORD_ONLY);
     }
@@ -96,7 +100,11 @@ public SamplingResult shouldSample(
             .getOptions()
             .getInternalTracesSampler()
             .sample(
-                new SamplingContext(transactionContext, null, propagationContext.getSampleRand()));
+                new SamplingContext(
+                    transactionContext,
+                    null,
+                    propagationContext.getSampleRand(),
+                    toMapWithStringKeys(attributes)));
 
     if (!sentryDecision.getSampled()) {
       scopes
@@ -135,6 +143,22 @@ public SamplingResult shouldSample(
     }
   }
 
+  private @NotNull Map<String, Object> toMapWithStringKeys(final @NotNull Attributes attributes) {
+    final @NotNull Map<String, Object> mapWithStringKeys = new HashMap<>(attributes.size());
+
+    if (attributes != null) {
+      attributes.forEach(
+          (key, value) -> {
+            if (key != null) {
+              final @NotNull String stringKey = key.getKey();
+              mapWithStringKeys.put(stringKey, value);
+            }
+          });
+    }
+
+    return mapWithStringKeys;
+  }
+
   @Override
   public String getDescription() {
     return "SentrySampler";

sentry-opentelemetry/sentry-opentelemetry-core/src/main/java/io/sentry/opentelemetry/SpanDescriptionExtractor.java

@@ -18,23 +18,16 @@ public final class SpanDescriptionExtractor {
   @SuppressWarnings("deprecation")
   public @NotNull OtelSpanInfo extractSpanInfo(
       final @NotNull SpanData otelSpan, final @Nullable IOtelSpanWrapper sentrySpan) {
-    if (!isInternalSpanKind(otelSpan)) {
-      final @NotNull Attributes attributes = otelSpan.getAttributes();
-
-      final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
-      if (httpMethod != null) {
-        return descriptionForHttpMethod(otelSpan, httpMethod);
-      }
+    final @NotNull Attributes attributes = otelSpan.getAttributes();
 
-      final @Nullable String httpRequestMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
-      if (httpRequestMethod != null) {
-        return descriptionForHttpMethod(otelSpan, httpRequestMethod);
-      }
+    final @Nullable String httpMethod = attributes.get(HttpAttributes.HTTP_REQUEST_METHOD);
+    if (httpMethod != null) {
+      return descriptionForHttpMethod(otelSpan, httpMethod);
+    }
 
-      final @Nullable String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM);
-      if (dbSystem != null) {
-        return descriptionForDbSystem(otelSpan);
-      }
+    final @Nullable String dbSystem = attributes.get(DbIncubatingAttributes.DB_SYSTEM);
+    if (dbSystem != null) {
+      return descriptionForDbSystem(otelSpan);
     }
 
     final @NotNull String name = otelSpan.getName();
@@ -44,10 +37,6 @@ public final class SpanDescriptionExtractor {
     return new OtelSpanInfo(name, description, TransactionNameSource.CUSTOM);
   }
 
-  private boolean isInternalSpanKind(final @NotNull SpanData otelSpan) {
-    return SpanKind.INTERNAL.equals(otelSpan.getKind());
-  }
-
   @SuppressWarnings("deprecation")
   private OtelSpanInfo descriptionForHttpMethod(
       final @NotNull SpanData otelSpan, final @NotNull String httpMethod) {
@@ -60,6 +49,12 @@ private OtelSpanInfo descriptionForHttpMethod(
       opBuilder.append(".client");
     } else if (SpanKind.SERVER.equals(kind)) {
       opBuilder.append(".server");
+    } else {
+      // we cannot be certain that a root span is a server span as it might simply be a client span
+      // without parent
+      if (!isRootSpan(otelSpan)) {
+        opBuilder.append(".client");
+      }
     }
     final @Nullable String httpTarget = attributes.get(HttpIncubatingAttributes.HTTP_TARGET);
     final @Nullable String httpRoute = attributes.get(HttpAttributes.HTTP_ROUTE);
@@ -92,6 +87,10 @@ private OtelSpanInfo descriptionForHttpMethod(
     return new OtelSpanInfo(op, description, transactionNameSource);
   }
 
+  private static boolean isRootSpan(SpanData otelSpan) {
+    return !otelSpan.getParentSpanContext().isValid() || otelSpan.getParentSpanContext().isRemote();
+  }
+
   @SuppressWarnings("deprecation")
   private OtelSpanInfo descriptionForDbSystem(final @NotNull SpanData otelSpan) {
     final @NotNull Attributes attributes = otelSpan.getAttributes();