updated settrace to accept sample rate and sample rand

bitsandfoxes · bitsandfoxes · commit 9a10493d2647 · 2025-02-26T13:20:03.000+01:00
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
@@ -335,9 +335,15 @@ private static Session updateSession(
    * Continue a trace based on the trace ID and span ID provided
    *
    * @param traceId the trace ID
-   * @param spanId the span 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 String sampleRand) {
-    getCurrentScopes().setTrace(traceId, spanId);
+  public static void setTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double sampleRate,
+      final @Nullable Double sampleRand) {
+    getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);
   }
 }
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
@@ -142,7 +142,7 @@ public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) {
                   nativeScope.setTrace(
                       spanContext.getTraceId().toString(), spanContext.getSpanId().toString()));
     } catch (Throwable e) {
-      options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTraceId failed.");
+      options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTrace failed.");
     }
   }
 }
diff --git a/sentry/src/main/java/io/sentry/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java
@@ -323,8 +323,12 @@ public void reportFullyDisplayed() {
   }
 
   @Override
-  public void setTrace(final @NotNull String traceId, final @NotNull String spanId) {
-    Sentry.getCurrentScopes().setTrace(traceId, spanId);
+  public void setTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double sampleRate,
+      final @Nullable Double sampleRand) {
+    Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);
   }
 
   @Override
diff --git a/sentry/src/main/java/io/sentry/HubScopesWrapper.java b/sentry/src/main/java/io/sentry/HubScopesWrapper.java
@@ -317,8 +317,12 @@ public void reportFullyDisplayed() {
   }
 
   @Override
-  public void setTrace(@NotNull String traceId, @NotNull String spanId) {
-    scopes.setTrace(traceId, spanId);
+  public void setTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double sampleRate,
+      final @Nullable Double sampleRand) {
+    Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);
   }
 
   @Override
diff --git a/sentry/src/main/java/io/sentry/IScopes.java b/sentry/src/main/java/io/sentry/IScopes.java
@@ -661,9 +661,15 @@ TransactionContext continueTrace(
    * Set a trace. This is primarily used by other SDKs in a Hybrid SDK context
    *
    * @param traceId the trace ID
-   * @param spanId the span ID this is continuing the trace from
-   */
-  void setTrace(final @NotNull String traceId, final @NotNull String spanId);
+   * @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
+   */
+  void setTrace(
+    final @NotNull String traceId,
+    final @NotNull String spanId,
+    final @Nullable Double sampleRate,
+    final @Nullable Double sampleRand);
 
   /**
    * Returns the "sentry-trace" header that allows tracing across services. Can also be used in
diff --git a/sentry/src/main/java/io/sentry/NoOpHub.java b/sentry/src/main/java/io/sentry/NoOpHub.java
@@ -277,7 +277,11 @@ public void reportFullyDisplayed() {}
   }
 
   @Override
-  public void setTrace(final @NotNull String traceID, final @NotNull String spanId) {}
+  public void setTrace(
+    final @NotNull String traceId,
+    final @NotNull String spanId,
+    final @Nullable Double sampleRate,
+    final @Nullable Double sampleRand) {}
 
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
diff --git a/sentry/src/main/java/io/sentry/NoOpScopes.java b/sentry/src/main/java/io/sentry/NoOpScopes.java
@@ -272,7 +272,11 @@ public void reportFullyDisplayed() {}
   }
 
   @Override
-  public void setTrace(final @NotNull String traceId, final @NotNull String spanId) {}
+  public void setTrace(
+    final @NotNull String traceId,
+    final @NotNull String spanId,
+    final @Nullable Double sampleRate,
+    final @Nullable Double sampleRand) {}
 
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
diff --git a/sentry/src/main/java/io/sentry/PropagationContext.java b/sentry/src/main/java/io/sentry/PropagationContext.java
@@ -52,9 +52,16 @@ public static PropagationContext fromHeaders(
   }
 
   public static @NotNull PropagationContext fromId(
-      final @NotNull String traceId, final @NotNull String spanId) {
+      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), null, null);
+      new SentryId(traceId),
+      new SpanId(),
+      new SpanId(spanId),
+      TracingUtils.ensureBaggage(null, null, decisionSampleRate, decisionSampleRand),
+      null);
   }
 
   private @NotNull SentryId traceId;
diff --git a/sentry/src/main/java/io/sentry/Scopes.java b/sentry/src/main/java/io/sentry/Scopes.java
@@ -991,8 +991,8 @@ public void reportFullyDisplayed() {
 
   @Override
   public void setTrace(
-    final @NotNull String traceId, final @NotNull String spanID) {
-    @NotNull PropagationContext propagationContext = PropagationContext.fromId(traceId, spanID);
+    final @NotNull String traceId, final @NotNull String spanId, final @Nullable Double sampleRate, final @Nullable Double sampleRand) {
+    @NotNull PropagationContext propagationContext = PropagationContext.fromId(traceId, spanId, sampleRate, sampleRand);
     configureScope(
         (scope) -> {
           scope.setPropagationContext(propagationContext);
diff --git a/sentry/src/main/java/io/sentry/ScopesAdapter.java b/sentry/src/main/java/io/sentry/ScopesAdapter.java
@@ -322,8 +322,12 @@ public void reportFullyDisplayed() {
   }
 
   @Override
-  public void setTrace(final @NotNull String traceId, final @NotNull String spanId) {
-    Sentry.getCurrentScopes().setTrace(traceId, spanId);
+  public void setTrace(
+      final @NotNull String traceId,
+      final @NotNull String spanId,
+      final @Nullable Double sampleRate,
+      final @Nullable Double sampleRand) {
+    Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);
   }
 
   @Override

Original file line number	Diff line number	Diff line change
`@@ -335,9 +335,15 @@ private static Session updateSession(`
`335`	`335`	`* Continue a trace based on the trace ID and span ID provided`
`336`	`336`	`*`
`337`	`337`	`* @param traceId the trace ID`
`338`		`- * @param spanId the span ID`
	`338`	`+ * @param spanId the trace origin's span ID`
	`339`	`+ * @param sampleRate the sample rate used by the origin of the trace`
	`340`	`+ * @param sampleRand the random value used to sample with by the origin of the trace`
`339`	`341`	`*/`
`340`		`- public static void setTrace(final @NotNull String traceId, final @NotNull String spanId, final @Nullable String sampleRand) {`
`341`		`- getCurrentScopes().setTrace(traceId, spanId);`
	`342`	`+ public static void setTrace(`
	`343`	`+ final @NotNull String traceId,`
	`344`	`+ final @NotNull String spanId,`
	`345`	`+ final @Nullable Double sampleRate,`
	`346`	`+ final @Nullable Double sampleRand) {`
	`347`	`+ getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);`
`342`	`348`	`}`
`343`	`349`	`}`
Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,7 @@ public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) {`
`142`	`142`	`nativeScope.setTrace(`
`143`	`143`	`spanContext.getTraceId().toString(), spanContext.getSpanId().toString()));`
`144`	`144`	`} catch (Throwable e) {`
`145`		`- options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTraceId failed.");`
	`145`	`+ options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTrace failed.");`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`	`}`
Original file line number	Diff line number	Diff line change
`@@ -323,8 +323,12 @@ public void reportFullyDisplayed() {`
`323`	`323`	`}`
`324`	`324`
`325`	`325`	`@Override`
`326`		`- public void setTrace(final @NotNull String traceId, final @NotNull String spanId) {`
`327`		`- Sentry.getCurrentScopes().setTrace(traceId, spanId);`
	`326`	`+ public void setTrace(`
	`327`	`+ final @NotNull String traceId,`
	`328`	`+ final @NotNull String spanId,`
	`329`	`+ final @Nullable Double sampleRate,`
	`330`	`+ final @Nullable Double sampleRand) {`
	`331`	`+ Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);`
`328`	`332`	`}`
`329`	`333`
`330`	`334`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -317,8 +317,12 @@ public void reportFullyDisplayed() {`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`@Override`
`320`		`- public void setTrace(@NotNull String traceId, @NotNull String spanId) {`
`321`		`- scopes.setTrace(traceId, spanId);`
	`320`	`+ public void setTrace(`
	`321`	`+ final @NotNull String traceId,`
	`322`	`+ final @NotNull String spanId,`
	`323`	`+ final @Nullable Double sampleRate,`
	`324`	`+ final @Nullable Double sampleRand) {`
	`325`	`+ Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);`
`322`	`326`	`}`
`323`	`327`
`324`	`328`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -322,8 +322,12 @@ public void reportFullyDisplayed() {`
`322`	`322`	`}`
`323`	`323`
`324`	`324`	`@Override`
`325`		`- public void setTrace(final @NotNull String traceId, final @NotNull String spanId) {`
`326`		`- Sentry.getCurrentScopes().setTrace(traceId, spanId);`
	`325`	`+ public void setTrace(`
	`326`	`+ final @NotNull String traceId,`
	`327`	`+ final @NotNull String spanId,`
	`328`	`+ final @Nullable Double sampleRate,`
	`329`	`+ final @Nullable Double sampleRand) {`
	`330`	`+ Sentry.getCurrentScopes().setTrace(traceId, spanId, sampleRate, sampleRand);`
`327`	`331`	`}`
`328`	`332`
`329`	`333`	`@Override`