Merge branch 'main' into feat/poc-capture-otel-events

adinauer · web-flow · commit acd3839c0274 · 2025-03-07T08:13:55.000+01:00
diff --git a/.craft.yml b/.craft.yml
@@ -57,3 +57,5 @@ targets:
       maven:io.sentry:sentry-apollo-3:
       maven:io.sentry:sentry-android-sqlite:
       maven:io.sentry:sentry-android-replay:
+      maven:io.sentry:sentry-apollo-4:
+      maven:io.sentry:sentry-reactor:
diff --git a/.github/ISSUE_TEMPLATE/bug_report_android.yml b/.github/ISSUE_TEMPLATE/bug_report_android.yml
@@ -1,6 +1,7 @@
 name: 🐞 Bug Report - Android
 description: Tell us about something that's not working the way we (probably) intend.
 labels: ["Platform: Android", "Type: Bug"]
+type: Bug
 body:
   - type: dropdown
     id: integration
diff --git a/.github/ISSUE_TEMPLATE/bug_report_java.yml b/.github/ISSUE_TEMPLATE/bug_report_java.yml
@@ -1,6 +1,7 @@
 name: 🐞 Bug Report - Java
 description: Tell us about something that's not working the way we (probably) intend.
 labels: ["Platform: Java", "Type: Bug"]
+type: Bug
 body:
   - type: dropdown
     id: integration
diff --git a/.github/ISSUE_TEMPLATE/feature_android.yml b/.github/ISSUE_TEMPLATE/feature_android.yml
@@ -1,6 +1,7 @@
 name: 💡 Feature Request - Android
 description: Tell us about a problem our SDK could solve but doesn't.
 labels: ["Platform: Android", "Type: Feature Request"]
+type: Feature
 body:
   - type: textarea
     id: problem
diff --git a/.github/ISSUE_TEMPLATE/feature_java.yml b/.github/ISSUE_TEMPLATE/feature_java.yml
@@ -1,6 +1,7 @@
 name: 💡 Feature Request - Java
 description: Tell us about a problem our SDK could solve but doesn't.
 labels: ["Platform: Java", "Type: Feature Request"]
+type: Feature
 body:
   - type: textarea
     id: problem
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,12 +2,26 @@
 
 ## Unreleased
 
+### Features
+
+- The SDK now automatically propagates the trace-context to the native layer. This allows to connect errors on different layers of the application. ([#4137](https://github.com/getsentry/sentry-java/pull/4137))
 - Capture OpenTelemetry span events ([#3564](https://github.com/getsentry/sentry-java/pull/3564))
   - OpenTelemetry spans may have exceptions attached to them (`openTelemetrySpan.recordException`). We can now send those to Sentry as errors.
   - Set `capture-open-telemetry-events=true` in `sentry.properties` to enable it
   - Set `sentry.capture-open-telemetry-events=true` in Springs `application.properties` to enable it
   - Set `sentry.captureOpenTelemetryEvents: true` in Springs `application.yml` to enable it
 
+### Behavioural Changes
+
+- Use `java.net.URI` for parsing URLs in `UrlUtils` ([#4210](https://github.com/getsentry/sentry-java/pull/4210))
+  - This could affect grouping for issues with messages containing URLs that fall in known corner cases that were handled incorrectly previously (e.g. email in URL path)
+
+### Dependencies
+
+- Bump Native SDK from v0.7.20 to v0.8.1 ([#4137](https://github.com/getsentry/sentry-java/pull/4137))
+  - [changelog](https://github.com/getsentry/sentry-native/blob/master/CHANGELOG.md#0810)
+  - [diff](https://github.com/getsentry/sentry-native/compare/v0.7.20...0.8.1)
+
 ## 8.3.0
 
 ### Features
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ Sentry SDK for Java and Android
 | sentry-jdbc                             | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jdbc/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-jdbc)                                                         |
 | sentry-apollo                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo)                                                     | 21 |
 | sentry-apollo-3                         | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-3)                                                 | 21 |
+| sentry-apollo-4                         | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-4/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-apollo-4)                                                 | 21 |
 | sentry-kotlin-extensions                | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-kotlin-extensions)                               | 21 |
 | sentry-servlet                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet)                                                   | |
 | sentry-servlet-jakarta                  | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-servlet-jakarta)                                   | |
@@ -56,6 +57,7 @@ Sentry SDK for Java and Android
 | sentry-opentelemetry-agentcustomization | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-agentcustomization/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-agentcustomization) |
 | sentry-opentelemetry-core               | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-opentelemetry-core)                             |
 | sentry-okhttp                           | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-okhttp)                                                     |
+| sentry-reactor                          | [![Maven Central](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor/badge.svg)](https://maven-badges.herokuapp.com/maven-central/io.sentry/sentry-reactor)                                                    |
 
 # Releases
 
diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt
@@ -159,7 +159,7 @@ object Config {
         val apolloKotlin = "com.apollographql.apollo3:apollo-runtime:3.8.2"
         val apolloKotlin4 = "com.apollographql.apollo:apollo-runtime:4.1.1"
 
-        val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.7.20"
+        val sentryNativeNdk = "io.sentry:sentry-native-ndk:0.8.1"
 
         object OpenTelemetry {
             val otelVersion = "1.44.1"
diff --git a/sentry-android-core/api/sentry-android-core.api b/sentry-android-core/api/sentry-android-core.api
@@ -221,6 +221,7 @@ public final class io/sentry/android/core/InternalSentrySdk {
 	public static fun getAppStartMeasurement ()Ljava/util/Map;
 	public static fun getCurrentScope ()Lio/sentry/IScope;
 	public static fun serializeScope (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/IScope;)Ljava/util/Map;
+	public static fun setTrace (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;)V
 }
 
 public final class io/sentry/android/core/LoadClass : io/sentry/util/LoadClass {
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/CurrentActivityIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/CurrentActivityIntegration.java
@@ -1,11 +1,14 @@
 package io.sentry.android.core;
 
+import static io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion;
+
 import android.app.Activity;
 import android.app.Application;
 import android.os.Bundle;
 import androidx.annotation.NonNull;
 import io.sentry.IScopes;
 import io.sentry.Integration;
+import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
 import io.sentry.util.Objects;
 import java.io.Closeable;
@@ -27,6 +30,8 @@ public CurrentActivityIntegration(final @NotNull Application application) {
   @Override
   public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) {
     application.registerActivityLifecycleCallbacks(this);
+    options.getLogger().log(SentryLevel.DEBUG, "CurrentActivityIntegration installed.");
+    addIntegrationToSdkVersion("CurrentActivity");
   }
 
   @Override
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java b/sentry-android-core/src/main/java/io/sentry/android/core/EnvelopeFileObserverIntegration.java
@@ -1,5 +1,7 @@
 package io.sentry.android.core;
 
+import static io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion;
+
 import io.sentry.ILogger;
 import io.sentry.IScopes;
 import io.sentry.ISentryLifecycleToken;
@@ -80,6 +82,7 @@ private void startOutboxSender(
     try {
       observer.startWatching();
       options.getLogger().log(SentryLevel.DEBUG, "EnvelopeFileObserverIntegration installed.");
+      addIntegrationToSdkVersion("EnvelopeFileObserver");
     } catch (Throwable e) {
       // it could throw eg NoSuchFileException or NullPointerException
       options
diff --git a/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java b/sentry-android-core/src/main/java/io/sentry/android/core/InternalSentrySdk.java
@@ -1,5 +1,6 @@
 package io.sentry.android.core;
 
+import static io.sentry.Sentry.getCurrentScopes;
 import static io.sentry.SentryLevel.DEBUG;
 import static io.sentry.SentryLevel.INFO;
 import static io.sentry.SentryLevel.WARNING;
@@ -13,6 +14,7 @@
 import io.sentry.IScopes;
 import io.sentry.ISerializer;
 import io.sentry.ObjectWriter;
+import io.sentry.PropagationContext;
 import io.sentry.ScopeType;
 import io.sentry.ScopesAdapter;
 import io.sentry.SentryEnvelope;
@@ -30,6 +32,7 @@
 import io.sentry.protocol.SentryId;
 import io.sentry.protocol.User;
 import io.sentry.util.MapObjectWriter;
+import io.sentry.util.TracingUtils;
 import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.InputStream;
@@ -329,4 +332,22 @@ private static Session updateSession(
         });
     return sessionRef.get();
   }
+
+  /**
+   * Allows a Hybrid SDK to set the trace on the native layer
+   *
+   * @param traceId the trace ID
+   * @param spanId the trace origin's span ID
+   * @param sampleRate the sample rate used by the origin of the trace
+   * @param sampleRand the random value used to sample with by the origin of the trace
+   */
+  public static void setTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double sampleRate,
+      final @Nullable Double sampleRand) {
+    TracingUtils.setTrace(
+        getCurrentScopes(),
+        PropagationContext.fromExistingTrace(traceId, spanId, sampleRate, sampleRand));
+  }
 }
diff --git a/sentry-android-core/src/test/java/io/sentry/android/core/InternalSentrySdkTest.kt b/sentry-android-core/src/test/java/io/sentry/android/core/InternalSentrySdkTest.kt
@@ -19,6 +19,7 @@ import io.sentry.SentryExceptionFactory
 import io.sentry.SentryItemType
 import io.sentry.SentryOptions
 import io.sentry.Session
+import io.sentry.SpanId
 import io.sentry.android.core.performance.ActivityLifecycleTimeSpan
 import io.sentry.android.core.performance.AppStartMetrics
 import io.sentry.exception.ExceptionMechanismException
@@ -505,4 +506,25 @@ class InternalSentrySdkTest {
         assertEquals(20.toLong(), actualProcessSpan["start_timestamp_ms"])
         assertEquals(100.toLong(), actualProcessSpan["end_timestamp_ms"])
     }
+
+    @Test
+    fun `setTrace sets correct propagation context`() {
+        val fixture = Fixture()
+        fixture.init(context)
+
+        val traceId = "771a43a4192642f0b136d5159a501700"
+        val spanId = "771a43a4192642f0"
+        val sampleRate = 0.5
+        val sampleRand = 0.3
+
+        InternalSentrySdk.setTrace(traceId, spanId, sampleRate, sampleRand)
+
+        Sentry.configureScope { scope ->
+            val propagationContext = scope.propagationContext
+            assertEquals(SentryId(traceId), propagationContext.traceId)
+            assertEquals(SpanId(spanId), propagationContext.parentSpanId)
+            assertEquals(sampleRate, propagationContext.baggage.sampleRateDouble)
+            assertEquals(sampleRand, propagationContext.baggage.sampleRandDouble)
+        }
+    }
 }
diff --git a/sentry-android-ndk/api/sentry-android-ndk.api b/sentry-android-ndk/api/sentry-android-ndk.api
@@ -20,6 +20,7 @@ public final class io/sentry/android/ndk/NdkScopeObserver : io/sentry/ScopeObser
 	public fun removeTag (Ljava/lang/String;)V
 	public fun setExtra (Ljava/lang/String;Ljava/lang/String;)V
 	public fun setTag (Ljava/lang/String;Ljava/lang/String;)V
+	public fun setTrace (Lio/sentry/SpanContext;Lio/sentry/IScope;)V
 	public fun setUser (Lio/sentry/protocol/User;)V
 }
 
diff --git a/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java b/sentry-android-ndk/src/main/java/io/sentry/android/ndk/NdkScopeObserver.java
@@ -2,9 +2,11 @@
 
 import io.sentry.Breadcrumb;
 import io.sentry.DateUtils;
+import io.sentry.IScope;
 import io.sentry.ScopeObserverAdapter;
 import io.sentry.SentryLevel;
 import io.sentry.SentryOptions;
+import io.sentry.SpanContext;
 import io.sentry.ndk.INativeScope;
 import io.sentry.ndk.NativeScope;
 import io.sentry.protocol.User;
@@ -125,4 +127,22 @@ public void removeExtra(final @NotNull String key) {
           .log(SentryLevel.ERROR, e, "Scope sync removeExtra(%s) has an error.", key);
     }
   }
+
+  @Override
+  public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) {
+    if (spanContext == null) {
+      return;
+    }
+
+    try {
+      options
+          .getExecutorService()
+          .submit(
+              () ->
+                  nativeScope.setTrace(
+                      spanContext.getTraceId().toString(), spanContext.getSpanId().toString()));
+    } catch (Throwable e) {
+      options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTrace failed.");
+    }
+  }
 }
diff --git a/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java b/sentry-openfeign/src/main/java/io/sentry/openfeign/SentryFeignClient.java
@@ -2,15 +2,18 @@
 
 import static io.sentry.TypeCheckHint.OPEN_FEIGN_REQUEST;
 import static io.sentry.TypeCheckHint.OPEN_FEIGN_RESPONSE;
+import static io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion;
 
 import feign.Client;
 import feign.Request;
 import feign.Response;
 import io.sentry.BaggageHeader;
 import io.sentry.Breadcrumb;
+import io.sentry.BuildConfig;
 import io.sentry.Hint;
 import io.sentry.IScopes;
 import io.sentry.ISpan;
+import io.sentry.SentryIntegrationPackageStorage;
 import io.sentry.SpanDataConvention;
 import io.sentry.SpanOptions;
 import io.sentry.SpanStatus;
@@ -42,6 +45,13 @@ public SentryFeignClient(
     this.delegate = Objects.requireNonNull(delegate, "delegate is required");
     this.scopes = Objects.requireNonNull(scopes, "scopes are required");
     this.beforeSpan = beforeSpan;
+    addPackageAndIntegrationInfo();
+  }
+
+  private void addPackageAndIntegrationInfo() {
+    SentryIntegrationPackageStorage.getInstance()
+        .addPackage("maven:io.sentry:sentry-openfeign", BuildConfig.VERSION_NAME);
+    addIntegrationToSdkVersion("OpenFeign");
   }
 
   @Override
diff --git a/sentry/api/sentry.api b/sentry/api/sentry.api
@@ -1954,6 +1954,7 @@ public final class io/sentry/PropagationContext {
 	public fun <init> ()V
 	public fun <init> (Lio/sentry/PropagationContext;)V
 	public fun <init> (Lio/sentry/protocol/SentryId;Lio/sentry/SpanId;Lio/sentry/SpanId;Lio/sentry/Baggage;Ljava/lang/Boolean;)V
+	public static fun fromExistingTrace (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;)Lio/sentry/PropagationContext;
 	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/lang/String;)Lio/sentry/PropagationContext;
 	public static fun fromHeaders (Lio/sentry/ILogger;Ljava/lang/String;Ljava/util/List;)Lio/sentry/PropagationContext;
 	public static fun fromHeaders (Lio/sentry/SentryTraceHeader;Lio/sentry/Baggage;Lio/sentry/SpanId;)Lio/sentry/PropagationContext;
@@ -6364,6 +6365,7 @@ public final class io/sentry/util/TracingUtils {
 	public static fun ensureBaggage (Lio/sentry/Baggage;Ljava/lang/Boolean;Ljava/lang/Double;Ljava/lang/Double;)Lio/sentry/Baggage;
 	public static fun isIgnored (Ljava/util/List;Ljava/lang/String;)Z
 	public static fun maybeUpdateBaggage (Lio/sentry/IScope;Lio/sentry/SentryOptions;)Lio/sentry/PropagationContext;
+	public static fun setTrace (Lio/sentry/IScopes;Lio/sentry/PropagationContext;)V
 	public static fun startNewTrace (Lio/sentry/IScopes;)V
 	public static fun trace (Lio/sentry/IScopes;Ljava/util/List;Lio/sentry/ISpan;)Lio/sentry/util/TracingUtils$TracingHeaders;
 	public static fun traceIfAllowed (Lio/sentry/IScopes;Ljava/lang/String;Ljava/util/List;Lio/sentry/ISpan;)Lio/sentry/util/TracingUtils$TracingHeaders;
diff --git a/sentry/src/main/java/io/sentry/PropagationContext.java b/sentry/src/main/java/io/sentry/PropagationContext.java
@@ -51,6 +51,19 @@ public static PropagationContext fromHeaders(
         sentryTraceHeader.isSampled());
   }
 
+  public static @NotNull PropagationContext fromExistingTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double decisionSampleRate,
+      final @Nullable Double decisionSampleRand) {
+    return new PropagationContext(
+        new SentryId(traceId),
+        new SpanId(),
+        new SpanId(spanId),
+        TracingUtils.ensureBaggage(null, null, decisionSampleRate, decisionSampleRand),
+        null);
+  }
+
   private @NotNull SentryId traceId;
   private @NotNull SpanId spanId;
   private @Nullable SpanId parentSpanId;
diff --git a/sentry/src/main/java/io/sentry/SpotlightIntegration.java b/sentry/src/main/java/io/sentry/SpotlightIntegration.java
@@ -3,6 +3,7 @@
 import static io.sentry.SentryLevel.DEBUG;
 import static io.sentry.SentryLevel.ERROR;
 import static io.sentry.SentryLevel.WARNING;
+import static io.sentry.util.IntegrationUtils.addIntegrationToSdkVersion;
 
 import io.sentry.util.Platform;
 import java.io.Closeable;
@@ -34,6 +35,7 @@ public void register(@NotNull IScopes scopes, @NotNull SentryOptions options) {
       executorService = new SentryExecutorService();
       options.setBeforeEnvelopeCallback(this);
       logger.log(DEBUG, "SpotlightIntegration enabled.");
+      addIntegrationToSdkVersion("Spotlight");
     } else {
       logger.log(
           DEBUG,
diff --git a/sentry/src/main/java/io/sentry/util/TracingUtils.java b/sentry/src/main/java/io/sentry/util/TracingUtils.java
@@ -28,6 +28,17 @@ public static void startNewTrace(final @NotNull IScopes scopes) {
         });
   }
 
+  public static void setTrace(
+      final @NotNull IScopes scopes, final @NotNull PropagationContext propagationContext) {
+    scopes.configureScope(
+        scope -> {
+          scope.withPropagationContext(
+              oldPropagationContext -> {
+                scope.setPropagationContext(propagationContext);
+              });
+        });
+  }
+
   public static @Nullable TracingHeaders traceIfAllowed(
       final @NotNull IScopes scopes,
       final @NotNull String requestUrl,
diff --git a/sentry/src/main/java/io/sentry/util/UrlUtils.java b/sentry/src/main/java/io/sentry/util/UrlUtils.java
diff --git a/sentry/src/test/java/io/sentry/util/UrlUtilsTest.kt b/sentry/src/test/java/io/sentry/util/UrlUtilsTest.kt

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ public final class io/sentry/android/core/InternalSentrySdk {`
`221`	`221`	`public static fun getAppStartMeasurement ()Ljava/util/Map;`
`222`	`222`	`public static fun getCurrentScope ()Lio/sentry/IScope;`
`223`	`223`	`public static fun serializeScope (Landroid/content/Context;Lio/sentry/android/core/SentryAndroidOptions;Lio/sentry/IScope;)Ljava/util/Map;`
	`224`	`+ public static fun setTrace (Ljava/lang/String;Ljava/lang/String;Ljava/lang/Double;Ljava/lang/Double;)V`
`224`	`225`	`}`
`225`	`226`
`226`	`227`	`public final class io/sentry/android/core/LoadClass : io/sentry/util/LoadClass {`