renamed

Author: bitsandfoxes

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.");
     }

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

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

sentry/src/main/java/io/sentry/IScopes.java

@@ -658,12 +658,12 @@ TransactionContext continueTrace(
       final @Nullable String sentryTrace, final @Nullable List<String> 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

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

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

sentry/src/main/java/io/sentry/Scopes.java

@@ -950,30 +950,41 @@ public void setActiveSpan(final @Nullable ISpan span) {
             getOptions().getCacheDirPath(), !getOptions().isEnableAutoSessionTracking());
   }
 
-  @Override
-  public void reportFullyDisplayed() {
-    if (getOptions().isEnableTimeToFullDisplayTracing()) {
-      getOptions().getFullyDisplayedReporter().reportFullyDrawn();
-    }
-  }
-
   @Override
   public @Nullable TransactionContext continueTrace(
-      final @Nullable String sentryTrace, final @Nullable List<String> baggageHeaders) {
+    final @Nullable String sentryTrace, final @Nullable List<String> baggageHeaders) {
     @NotNull
     PropagationContext propagationContext =
-        PropagationContext.fromHeaders(getOptions().getLogger(), sentryTrace, baggageHeaders);
+      PropagationContext.fromHeaders(getOptions().getLogger(), sentryTrace, baggageHeaders);
     configureScope(
-        (scope) -> {
-          scope.setPropagationContext(propagationContext);
-        });
+      (scope) -> {
+        scope.setPropagationContext(propagationContext);
+      });
     if (getOptions().isTracingEnabled()) {
       return TransactionContext.fromPropagationContext(propagationContext);
     } else {
       return null;
     }
   }
 
+  @Override
+  public void continueTrace(
+    final @NotNull String traceId, final @NotNull String spanID) {
+    @NotNull
+    PropagationContext propagationContext = PropagationContext.fromId(traceId, spanID);
+    configureScope(
+      (scope) -> {
+        scope.setPropagationContext(propagationContext);
+      });
+  }
+
+  @Override
+  public void reportFullyDisplayed() {
+    if (getOptions().isEnableTimeToFullDisplayTracing()) {
+      getOptions().getFullyDisplayedReporter().reportFullyDrawn();
+    }
+  }
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     if (!isEnabled()) {

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

sentry/src/main/java/io/sentry/Sentry.java

@@ -1169,9 +1169,9 @@ public interface OptionsConfiguration<T extends SentryOptions> {
    * @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);
   }
 
   /**