added API taking traceId and spanID

Author: bitsandfoxes

sentry/src/main/java/io/sentry/HubAdapter.java

@@ -322,6 +322,12 @@ public void reportFullyDisplayed() {
     return Sentry.continueTrace(sentryTrace, baggageHeaders);
   }
 
+  @Override
+  public void continueTrace(
+     final @NotNull String traceId, final @NotNull String spanId) {
+    Sentry.continueTrace(traceId, spanId);
+  }
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     return Sentry.getTraceparent();

sentry/src/main/java/io/sentry/HubScopesWrapper.java

@@ -316,6 +316,12 @@ public void reportFullyDisplayed() {
     return scopes.continueTrace(sentryTrace, baggageHeaders);
   }
 
+  @Override
+  public void continueTrace(
+      @NotNull String traceId, @NotNull String spanId) {
+    scopes.continueTrace(traceId, spanId);
+  }
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     return scopes.getTraceparent();

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

@@ -657,6 +657,14 @@ void setSpanContext(
   TransactionContext continueTrace(
       final @Nullable String sentryTrace, final @Nullable List<String> baggageHeaders);
 
+  /**
+   * Continue a trace based on the trace ID and span ID provided
+   *
+   * @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);
+
   /**
    * Returns the "sentry-trace" header that allows tracing across services. Can also be used in
    * &lt;meta&gt; HTML tags. Also see {@link IScopes#getBaggage()}.

sentry/src/main/java/io/sentry/JsonSerializer.java

@@ -200,8 +200,8 @@ public <T> void serialize(@NotNull T entity, @NotNull Writer writer) throws IOEx
     Objects.requireNonNull(writer, "The Writer object is required.");
 
     if (options.getLogger().isEnabled(SentryLevel.DEBUG)) {
-      String serialized = serializeToString(entity, options.isEnablePrettySerializationOutput());
-      options.getLogger().log(SentryLevel.DEBUG, "Serializing object: %s", serialized);
+//      String serialized = serializeToString(entity, options.isEnablePrettySerializationOutput());
+//      options.getLogger().log(SentryLevel.DEBUG, "Serializing object: %s", serialized);
     }
     JsonObjectWriter jsonObjectWriter = new JsonObjectWriter(writer, options.getMaxDepth());
     jsonObjectWriter.value(options.getLogger(), entity);

sentry/src/main/java/io/sentry/NoOpHub.java

@@ -276,6 +276,10 @@ public void reportFullyDisplayed() {}
     return null;
   }
 
+  @Override
+  public void continueTrace(
+    final @NotNull String traceID, final @NotNull String spanId) {}
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     return null;

sentry/src/main/java/io/sentry/NoOpScopes.java

@@ -271,6 +271,10 @@ public void reportFullyDisplayed() {}
     return null;
   }
 
+  @Override
+  public void continueTrace(
+    final @NotNull String traceId, final @NotNull String spanId) { }
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     return null;

sentry/src/main/java/io/sentry/PropagationContext.java

@@ -50,6 +50,18 @@ public static PropagationContext fromHeaders(
         sentryTraceHeader.isSampled());
   }
 
+  public static @NotNull PropagationContext fromId(
+      final @NotNull String traceId,
+      final @NotNull String spanId) {
+    return new PropagationContext(
+      new SentryId(traceId),
+      new SpanId(),
+      new SpanId(spanId),
+      null,
+      null
+    );
+  }
+
   private @NotNull SentryId traceId;
   private @NotNull SpanId spanId;
   private @Nullable SpanId parentSpanId;

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

@@ -948,30 +948,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

@@ -321,6 +321,12 @@ public void reportFullyDisplayed() {
     return Sentry.continueTrace(sentryTrace, baggageHeaders);
   }
 
+  @Override
+  public void continueTrace(
+    final @NotNull String traceId, final @NotNull String spanId) {
+      Sentry.continueTrace(traceId, spanId);
+  }
+
   @Override
   public @Nullable SentryTraceHeader getTraceparent() {
     return Sentry.getTraceparent();

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

@@ -1147,6 +1147,18 @@ public interface OptionsConfiguration<T extends SentryOptions> {
     return getCurrentScopes().continueTrace(sentryTrace, baggageHeaders);
   }
 
+  /**
+   * Continue a trace based on the trace ID and span ID provided
+   *
+   * @param traceId the trace ID
+   * @param spanId the span ID
+   */
+  // return TransactionContext (if performance enabled) or null (if performance disabled)
+  public static void continueTrace(
+      final @NotNull String traceId, final @NotNull String spanId) {
+    getCurrentScopes().continueTrace(traceId, spanId);
+  }
+
   /**
    * Returns the "sentry-trace" header that allows tracing across services. Can also be used in
    * &lt;meta&gt; HTML tags. Also see {@link Sentry#getBaggage()}.