Merge branch 'main' into feat/bump-otel-1_51_0

Author: adinauer

CHANGELOG.md

@@ -1,11 +1,13 @@
 # Changelog
 
-## Unreleased
+## 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))
 
 ### Dependencies
 

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-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()));