Merge branch 'main' into feat/timber-sentry-logs

# Conflicts:
#	CHANGELOG.md
#	sentry-android-core/src/main/java/io/sentry/android/core/SentryLogcatAdapter.java
#	sentry-android-core/src/test/java/io/sentry/android/core/SentryLogcatAdapterTest.kt

Author: stefanosiano

CHANGELOG.md

@@ -8,10 +8,17 @@
   - Enable the Logs feature in your `SentryOptions` or with the `io.sentry.logs.enabled` manifest option and the SDK will automatically send Timber logs to Sentry, if the TimberIntegration is enabled.
   - The SDK will automatically detect Timber and use it to send logs to Sentry.
 - Send logcat through Sentry Logs ([#4487](https://github.com/getsentry/sentry-java/pull/4487))
-    - Enable the Logs feature in your `SentryOptions` or with the `io.sentry.logs.enabled` manifest option and the SDK will automatically send logcat logs to Sentry, if the Sentry Android Gradle plugin is applied.
-    - To set the logcat level check the [Logcat integration documentation](https://docs.sentry.io/platforms/android/integrations/logcat/#configure).
+  - Enable the Logs feature in your `SentryOptions` or with the `io.sentry.logs.enabled` manifest option and the SDK will automatically send logcat logs to Sentry, if the Sentry Android Gradle plugin is applied.
+  - To set the logcat level check the [Logcat integration documentation](https://docs.sentry.io/platforms/android/integrations/logcat/#configure).
+
+## 8.16.1-alpha.2
+
+### Fixes
+
 - Optimize scope when maxBreadcrumb is 0 ([#4504](https://github.com/getsentry/sentry-java/pull/4504))
 - Fix javadoc on TransportResult ([#4528](https://github.com/getsentry/sentry-java/pull/4528))
+- Session Replay: Fix `IllegalArgumentException` when `Bitmap` is initialized with non-positive values ([#4536](https://github.com/getsentry/sentry-java/pull/4536))
+- Set thread information on transaction from OpenTelemetry attributes ([#4478](https://github.com/getsentry/sentry-java/pull/4478))
 
 ### Internal
 

gradle.properties

@@ -11,7 +11,7 @@ org.jetbrains.dokka.experimental.gradle.pluginMode=V2Enabled
 android.useAndroidX=true
 
 # Release information
-versionName=8.16.0
+versionName=8.16.1-alpha.2
 
 # Override the SDK name on native crashes on Android
 sentryAndroidSdkName=sentry.native.android

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

@@ -6,8 +6,6 @@
 import io.sentry.Sentry;
 import io.sentry.SentryLevel;
 import io.sentry.SentryLogLevel;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -57,15 +55,11 @@ private static void addAsLog(
     if (!scopes.getOptions().getLogs().isEnabled()) {
       return;
     }
-    if (tr == null) {
+    final @Nullable String trMessage = tr != null ? tr.getMessage() : null;
+    if (tr == null || trMessage == null) {
       scopes.logger().log(level, msg);
     } else {
-      StringWriter sw = new StringWriter(256);
-      PrintWriter pw = new PrintWriter(sw, false);
-      tr.printStackTrace(pw);
-      pw.flush();
-      scopes.logger().log(level, msg != null ? (msg + "\n" + sw.toString()) : sw.toString());
-      pw.close();
+      scopes.logger().log(level, msg != null ? (msg + "\n" + trMessage) : trMessage);
     }
   }
 

sentry-android-core/src/test/java/io/sentry/android/core/SentryLogcatAdapterTest.kt

@@ -113,7 +113,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg error exception", SentryLevel.ERROR)
     fixture.logs
       .first()
-      .assert("$commonMsg error exception\n${throwable.stackTraceToString()}", SentryLogLevel.ERROR)
+      .assert("$commonMsg error exception\n${throwable.message}", SentryLogLevel.ERROR)
   }
 
   @Test
@@ -123,10 +123,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg verbose exception", SentryLevel.DEBUG)
     fixture.logs
       .first()
-      .assert(
-        "$commonMsg verbose exception\n${throwable.stackTraceToString()}",
-        SentryLogLevel.TRACE,
-      )
+      .assert("$commonMsg verbose exception\n${throwable.message}", SentryLogLevel.TRACE)
   }
 
   @Test
@@ -136,7 +133,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg info exception", SentryLevel.INFO)
     fixture.logs
       .first()
-      .assert("$commonMsg info exception\n${throwable.stackTraceToString()}", SentryLogLevel.INFO)
+      .assert("$commonMsg info exception\n${throwable.message}", SentryLogLevel.INFO)
   }
 
   @Test
@@ -146,7 +143,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg debug exception", SentryLevel.DEBUG)
     fixture.logs
       .first()
-      .assert("$commonMsg debug exception\n${throwable.stackTraceToString()}", SentryLogLevel.DEBUG)
+      .assert("$commonMsg debug exception\n${throwable.message}", SentryLogLevel.DEBUG)
   }
 
   @Test
@@ -156,10 +153,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg warning exception", SentryLevel.WARNING)
     fixture.logs
       .first()
-      .assert(
-        "$commonMsg warning exception\n${throwable.stackTraceToString()}",
-        SentryLogLevel.WARN,
-      )
+      .assert("$commonMsg warning exception\n${throwable.message}", SentryLogLevel.WARN)
   }
 
   @Test
@@ -169,7 +163,7 @@ class SentryLogcatAdapterTest {
     fixture.breadcrumbs.first().assert(tag, "$commonMsg wtf exception", SentryLevel.ERROR)
     fixture.logs
       .first()
-      .assert("$commonMsg wtf exception\n${throwable.stackTraceToString()}", SentryLogLevel.FATAL)
+      .assert("$commonMsg wtf exception\n${throwable.message}", SentryLogLevel.FATAL)
   }
 
   @Test

sentry-android-replay/src/main/java/io/sentry/android/replay/util/Views.kt

@@ -245,4 +245,4 @@ internal fun View?.removeOnPreDrawListenerSafe(listener: ViewTreeObserver.OnPreD
   }
 }
 
-internal fun View.hasSize(): Boolean = width != 0 && height != 0
+internal fun View.hasSize(): Boolean = width > 0 && height > 0

sentry-android-replay/src/test/java/io/sentry/android/replay/util/ViewsTest.kt

@@ -0,0 +1,36 @@
+package io.sentry.android.replay.util
+
+import android.view.View
+import androidx.test.core.app.ApplicationProvider
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import kotlin.test.Test
+import kotlin.test.assertFalse
+import kotlin.test.assertTrue
+import org.junit.runner.RunWith
+
+@RunWith(AndroidJUnit4::class)
+class ViewsTest {
+  @Test
+  fun `hasSize returns true for positive values`() {
+    val view = View(ApplicationProvider.getApplicationContext())
+    view.right = 100
+    view.bottom = 100
+    assertTrue(view.hasSize())
+  }
+
+  @Test
+  fun `hasSize returns false for null values`() {
+    val view = View(ApplicationProvider.getApplicationContext())
+    view.right = 0
+    view.bottom = 0
+    assertFalse(view.hasSize())
+  }
+
+  @Test
+  fun `hasSize returns false for negative values`() {
+    val view = View(ApplicationProvider.getApplicationContext())
+    view.right = -1
+    view.bottom = -1
+    assertFalse(view.hasSize())
+  }
+}

sentry-opentelemetry/sentry-opentelemetry-core/api/sentry-opentelemetry-core.api

@@ -50,6 +50,11 @@ public final class io/sentry/opentelemetry/OtelSpanInfo {
 	public fun getTransactionNameSource ()Lio/sentry/protocol/TransactionNameSource;
 }
 
+public final class io/sentry/opentelemetry/OtelSpanUtils {
+	public fun <init> ()V
+	public static fun maybeTransferOtelAttribute (Lio/opentelemetry/sdk/trace/data/SpanData;Lio/sentry/ISpan;Lio/opentelemetry/api/common/AttributeKey;)V
+}
+
 public final class io/sentry/opentelemetry/OtelSpanWrapper : io/sentry/opentelemetry/IOtelSpanWrapper {
 	public fun <init> (Lio/opentelemetry/sdk/trace/ReadWriteSpan;Lio/sentry/IScopes;Lio/sentry/SentryDate;Lio/sentry/TracesSamplingDecision;Lio/sentry/opentelemetry/IOtelSpanWrapper;Lio/sentry/SpanId;Lio/sentry/Baggage;)V
 	public fun finish ()V

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

@@ -0,0 +1,21 @@
+package io.sentry.opentelemetry;
+
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.sdk.trace.data.SpanData;
+import io.sentry.ISpan;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public final class OtelSpanUtils {
+  public static <T> void maybeTransferOtelAttribute(
+      final @NotNull SpanData otelSpan,
+      final @NotNull ISpan sentrySpan,
+      final @NotNull AttributeKey<T> key) {
+    final @NotNull Attributes attributes = otelSpan.getAttributes();
+    final @Nullable T value = attributes.get(key);
+    if (value != null) {
+      sentrySpan.setData(key.getKey(), value);
+    }
+  }
+}

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

@@ -3,6 +3,7 @@
 import static io.sentry.TransactionContext.DEFAULT_TRANSACTION_NAME;
 import static io.sentry.opentelemetry.InternalSemanticAttributes.IS_REMOTE_PARENT;
 import static io.sentry.opentelemetry.OtelInternalSpanDetectionUtil.isSentryRequest;
+import static io.sentry.opentelemetry.OtelSpanUtils.maybeTransferOtelAttribute;
 
 import io.opentelemetry.api.common.Attributes;
 import io.opentelemetry.api.trace.StatusCode;
@@ -12,6 +13,7 @@
 import io.opentelemetry.sdk.trace.export.SpanExporter;
 import io.opentelemetry.semconv.HttpAttributes;
 import io.opentelemetry.semconv.incubating.ProcessIncubatingAttributes;
+import io.opentelemetry.semconv.incubating.ThreadIncubatingAttributes;
 import io.sentry.Baggage;
 import io.sentry.DateUtils;
 import io.sentry.DefaultSpanFactory;
@@ -340,6 +342,9 @@ private void transferSpanDetails(
     setOtelSpanKind(span, sentryTransaction);
     transferSpanDetails(sentrySpanMaybe, sentryTransaction);
 
+    maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_ID);
+    maybeTransferOtelAttribute(span, sentryTransaction, ThreadIncubatingAttributes.THREAD_NAME);
+
     scopesToUse.configureScope(
         ScopeType.CURRENT,
         scope -> attributesExtractor.extract(span, scope, scopesToUse.getOptions()));