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 index a5eac55ec3..11586e7fed 100644 --- 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 @@ -137,7 +137,7 @@ public void setTrace(@Nullable SpanContext spanContext, @NotNull IScope scope) { } try { - options.getExecutorService().submit(() -> nativeScope.setTraceId(spanContext.getTraceId().toString(), spanContext.getSpanId().toString())); + options.getExecutorService().submit(() -> nativeScope.setTrace(spanContext.getTraceId().toString(), spanContext.getSpanId().toString())); } catch (Throwable e) { options.getLogger().log(SentryLevel.ERROR, e, "Scope sync setTraceId failed."); } diff --git a/sentry/src/main/java/io/sentry/HubAdapter.java b/sentry/src/main/java/io/sentry/HubAdapter.java index 5ef0ddf0aa..3ded4f3dd3 100644 --- a/sentry/src/main/java/io/sentry/HubAdapter.java +++ b/sentry/src/main/java/io/sentry/HubAdapter.java @@ -323,9 +323,9 @@ public void reportFullyDisplayed() { } @Override - public void continueTrace( + public void setTrace( final @NotNull String traceId, final @NotNull String spanId) { - Sentry.continueTrace(traceId, spanId); + Sentry.setTrace(traceId, spanId); } @Override diff --git a/sentry/src/main/java/io/sentry/HubScopesWrapper.java b/sentry/src/main/java/io/sentry/HubScopesWrapper.java index 93bd26d452..536bf081c4 100644 --- a/sentry/src/main/java/io/sentry/HubScopesWrapper.java +++ b/sentry/src/main/java/io/sentry/HubScopesWrapper.java @@ -317,9 +317,9 @@ public void reportFullyDisplayed() { } @Override - public void continueTrace( + public void setTrace( @NotNull String traceId, @NotNull String spanId) { - scopes.continueTrace(traceId, spanId); + scopes.setTrace(traceId, spanId); } @Override diff --git a/sentry/src/main/java/io/sentry/IScopes.java b/sentry/src/main/java/io/sentry/IScopes.java index 1d6850082b..56b6204b31 100644 --- a/sentry/src/main/java/io/sentry/IScopes.java +++ b/sentry/src/main/java/io/sentry/IScopes.java @@ -658,12 +658,12 @@ TransactionContext continueTrace( final @Nullable String sentryTrace, final @Nullable List baggageHeaders); /** - * Continue a trace based on the trace ID and span ID provided + * 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 continueTrace(final @NotNull String traceId, final @NotNull String spanId); + void setTrace(final @NotNull String traceId, final @NotNull String spanId); /** * 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 index 7d1f0f7ad1..ffef099147 100644 --- a/sentry/src/main/java/io/sentry/NoOpHub.java +++ b/sentry/src/main/java/io/sentry/NoOpHub.java @@ -277,7 +277,7 @@ public void reportFullyDisplayed() {} } @Override - public void continueTrace( + public void setTrace( final @NotNull String traceID, final @NotNull String spanId) {} @Override diff --git a/sentry/src/main/java/io/sentry/NoOpScopes.java b/sentry/src/main/java/io/sentry/NoOpScopes.java index 52d19a0c95..d05eec0d23 100644 --- a/sentry/src/main/java/io/sentry/NoOpScopes.java +++ b/sentry/src/main/java/io/sentry/NoOpScopes.java @@ -272,7 +272,7 @@ public void reportFullyDisplayed() {} } @Override - public void continueTrace( + public void setTrace( final @NotNull String traceId, final @NotNull String spanId) { } @Override diff --git a/sentry/src/main/java/io/sentry/Scopes.java b/sentry/src/main/java/io/sentry/Scopes.java index 02794364ce..af300ab7d4 100644 --- a/sentry/src/main/java/io/sentry/Scopes.java +++ b/sentry/src/main/java/io/sentry/Scopes.java @@ -966,7 +966,7 @@ public void setActiveSpan(final @Nullable ISpan span) { } @Override - public void continueTrace( + public void setTrace( final @NotNull String traceId, final @NotNull String spanID) { @NotNull PropagationContext propagationContext = PropagationContext.fromId(traceId, spanID); diff --git a/sentry/src/main/java/io/sentry/ScopesAdapter.java b/sentry/src/main/java/io/sentry/ScopesAdapter.java index 102bb816ac..6b64aead1e 100644 --- a/sentry/src/main/java/io/sentry/ScopesAdapter.java +++ b/sentry/src/main/java/io/sentry/ScopesAdapter.java @@ -322,9 +322,9 @@ public void reportFullyDisplayed() { } @Override - public void continueTrace( + public void setTrace( final @NotNull String traceId, final @NotNull String spanId) { - Sentry.continueTrace(traceId, spanId); + Sentry.setTrace(traceId, spanId); } @Override diff --git a/sentry/src/main/java/io/sentry/Sentry.java b/sentry/src/main/java/io/sentry/Sentry.java index a30474ca8d..ad98a2ffd8 100644 --- a/sentry/src/main/java/io/sentry/Sentry.java +++ b/sentry/src/main/java/io/sentry/Sentry.java @@ -1154,9 +1154,9 @@ public interface OptionsConfiguration { * @param spanId the span ID */ // return TransactionContext (if performance enabled) or null (if performance disabled) - public static void continueTrace( + public static void setTrace( final @NotNull String traceId, final @NotNull String spanId) { - getCurrentScopes().continueTrace(traceId, spanId); + getCurrentScopes().setTrace(traceId, spanId); } /**