Merge 747718f into ba90bd9

CHANGELOG.md

@@ -14,6 +14,7 @@
         - Auxiliary information (such as current memory load) at the time of ANR event.
       - If you would like us to provide support for the old approach working alongside the new one on Android 11 and above (e.g. for raising events for slow code on main thread), consider upvoting [this issue](https://github.com/getsentry/sentry-java/issues/2693).
     - The old watchdog implementation will continue working for older API versions (Android < 11)
+- Open up transaction methods ([#2701](https://github.com/getsentry/sentry-java/pull/2701))
 
 ### Fixes
 

sentry/api/sentry.api

@@ -620,6 +620,7 @@ public abstract interface class io/sentry/ITransaction : io/sentry/ISpan {
 	public abstract fun setContext (Ljava/lang/String;Ljava/lang/Object;)V
 	public abstract fun setName (Ljava/lang/String;)V
 	public abstract fun setName (Ljava/lang/String;Lio/sentry/protocol/TransactionNameSource;)V
+	public abstract fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
 }
 
 public abstract interface class io/sentry/ITransactionProfiler {
@@ -924,6 +925,7 @@ public final class io/sentry/NoOpTransaction : io/sentry/ITransaction {
 	public fun setThrowable (Ljava/lang/Throwable;)V
 	public fun startChild (Ljava/lang/String;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ISpan;
+	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
@@ -1916,6 +1918,7 @@ public final class io/sentry/SentryTracer : io/sentry/ITransaction {
 	public fun setThrowable (Ljava/lang/Throwable;)V
 	public fun startChild (Ljava/lang/String;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;)Lio/sentry/ISpan;
+	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SentryDate;Lio/sentry/Instrumenter;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;
 	public fun startChild (Ljava/lang/String;Ljava/lang/String;Lio/sentry/SpanOptions;)Lio/sentry/ISpan;

sentry/src/main/java/io/sentry/IHub.java

@@ -494,7 +494,15 @@ ITransaction startTransaction(
     return startTransaction(name, operation, null);
   }
 
-  @ApiStatus.Internal
+  /**
+   * Creates a Transaction and returns the instance. Based on the passed transaction context and
+   * transaction options the decision if transaction is sampled will be taken by {@link
+   * TracesSampler}.
+   *
+   * @param transactionContext the transaction context
+   * @param transactionOptions the transaction options
+   * @return created transaction.
+   */
   @NotNull
   ITransaction startTransaction(
       final @NotNull TransactionContext transactionContext,

sentry/src/main/java/io/sentry/ITransaction.java

@@ -41,6 +41,18 @@ public interface ITransaction extends ISpan {
   @TestOnly
   List<Span> getSpans();
 
+  /**
+   * Starts a child Span.
+   *
+   * @param operation - new span operation name
+   * @param description - the span description
+   * @param timestamp - the start timestamp of the span
+   * @return a new transaction span
+   */
+  @NotNull
+  ISpan startChild(
+      @NotNull String operation, @Nullable String description, @Nullable SentryDate timestamp);
+
   /**
    * Returns if transaction is sampled.
    *

sentry/src/main/java/io/sentry/NoOpTransaction.java

@@ -82,6 +82,12 @@ public void setName(@NotNull String name, @NotNull TransactionNameSource transac
     return Collections.emptyList();
   }
 
+  @Override
+  public @NotNull ISpan startChild(
+      @NotNull String operation, @Nullable String description, @Nullable SentryDate timestamp) {
+    return NoOpSpan.getInstance();
+  }
+
   @Override
   public @Nullable Span getLatestActiveSpan() {
     return null;

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

@@ -886,7 +886,6 @@ public static void endSession() {
    * @param transactionOptions options for the transaction
    * @return created transaction.
    */
-  @ApiStatus.Internal
   public static @NotNull ITransaction startTransaction(
       final @NotNull TransactionContext transactionContext,
       final @NotNull TransactionOptions transactionOptions) {

sentry/src/main/java/io/sentry/SentryTracer.java

@@ -404,6 +404,14 @@ private ISpan createChild(
     return createChild(operation, description, timestamp, instrumenter, spanOptions);
   }
 
+  @Override
+  public @NotNull ISpan startChild(
+      final @NotNull String operation,
+      @Nullable String description,
+      @Nullable SentryDate timestamp) {
+    return createChild(operation, description, timestamp, Instrumenter.SENTRY, new SpanOptions());
+  }
+
   @Override
   public @NotNull ISpan startChild(
       final @NotNull String operation, final @Nullable String description) {

sentry/src/main/java/io/sentry/TransactionOptions.java

@@ -1,9 +1,8 @@
 package io.sentry;
 
-import org.jetbrains.annotations.ApiStatus;
 import org.jetbrains.annotations.Nullable;
 
-@ApiStatus.Internal
+/** Sentry Transaction options */
 public final class TransactionOptions extends SpanOptions {
 
   private @Nullable CustomSamplingContext customSamplingContext = null;

sentry/src/test/java/io/sentry/NoOpTransactionTest.kt

@@ -15,6 +15,10 @@ class NoOpTransactionTest {
     fun `startChild does not return null`() {
         assertNotNull(transaction.startChild("op"))
         assertNotNull(transaction.startChild("op", "desc"))
+        assertNotNull(transaction.startChild("op", "desc", SpanOptions()))
+        assertNotNull(transaction.startChild("op", "desc", SentryNanotimeDate()))
+        assertNotNull(transaction.startChild("op", "desc", SentryNanotimeDate(), Instrumenter.SENTRY))
+        assertNotNull(transaction.startChild("op", "desc", SentryNanotimeDate(), Instrumenter.SENTRY, SpanOptions()))
     }
 
     @Test

sentry/src/test/java/io/sentry/SentryTracerTest.kt

@@ -328,6 +328,27 @@ class SentryTracerTest {
         assertEquals(tracer.root.traceId, span.traceId)
     }
 
+    @Test
+    fun `starting child with operation, description and timestamp creates a new span`() {
+        val tracer = fixture.getSut()
+        val sentryDate = SentryNanotimeDate()
+        val span = tracer.startChild("op", "description", sentryDate) as Span
+        assertNotNull(span)
+        assertNotNull(span.spanId)
+        assertNotNull(span.startDate)
+        assertEquals("op", span.operation)
+        assertEquals("description", span.description)
+        assertEquals(sentryDate, span.startDate)
+    }
+
+    @Test
+    fun `sstarting child with operation, description and timestamp adds a span to transaction`() {
+        val tracer = fixture.getSut()
+        val span = tracer.startChild("op", "description", SentryNanotimeDate())
+        assertEquals(1, tracer.children.size)
+        assertEquals(span, tracer.children.first())
+    }
+
     @Test
     fun `setting op sets op on TraceContext`() {
         val tracer = fixture.getSut()