RUM-9902 - simplifying api

Author: satween

features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandlerTest.kt

@@ -46,7 +46,7 @@ import com.datadog.android.telemetry.model.TelemetryDebugEvent
 import com.datadog.android.telemetry.model.TelemetryErrorEvent
 import com.datadog.android.telemetry.model.TelemetryUsageEvent
 import com.datadog.android.trace.GlobalDatadogTracerHolder
-import com.datadog.android.trace.api.span.clear
+import com.datadog.android.trace.api.clear
 import com.datadog.android.trace.api.tracer.DatadogTracer
 import com.datadog.tools.unit.forge.aThrowable
 import fr.xgouchet.elmyr.Forge

features/dd-sdk-android-trace-api/api/dd-sdk-android-trace-api.api

@@ -154,6 +154,9 @@ public abstract interface class com/datadog/android/trace/api/span/DatadogSpanLo
 	public abstract fun logErrorMessage (Ljava/lang/String;Lcom/datadog/android/trace/api/span/DatadogSpan;)V
 }
 
+public abstract interface class com/datadog/android/trace/api/span/DatadogSpanWriter {
+}
+
 public final class com/datadog/android/trace/api/span/NoOpDatadogSpanLogger : com/datadog/android/trace/api/span/DatadogSpanLogger {
 	public fun <init> ()V
 	public fun log (Ljava/lang/String;Lcom/datadog/android/trace/api/span/DatadogSpan;)V
@@ -163,14 +166,14 @@ public final class com/datadog/android/trace/api/span/NoOpDatadogSpanLogger : co
 }
 
 public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceId {
-	public abstract fun toHexString ()Ljava/lang/String;
-	public abstract fun toLong ()J
 }
 
-public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceIdFactory {
+public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceIdConverter {
 	public abstract fun from (J)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
 	public abstract fun from (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
 	public abstract fun fromHex (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
+	public abstract fun toHexString (Lcom/datadog/android/trace/api/trace/DatadogTraceId;)Ljava/lang/String;
+	public abstract fun toLong (Lcom/datadog/android/trace/api/trace/DatadogTraceId;)J
 	public abstract fun zero ()Lcom/datadog/android/trace/api/trace/DatadogTraceId;
 }
 

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpanContext.kt

@@ -5,7 +5,6 @@
  */
 package com.datadog.android.trace.api.span
 
-import com.datadog.android.lint.InternalApi
 import com.datadog.android.trace.api.trace.DatadogTraceId
 import com.datadog.tools.annotation.NoOpImplementation
 

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/span/DatadogSpanWriter.kt

@@ -0,0 +1,12 @@
+/*
+ * Unless explicitly stated otherwise all files in this repository are licensed under the Apache License Version 2.0.
+ * This product includes software developed at Datadog (https://www.datadoghq.com/).
+ * Copyright 2016-Present Datadog, Inc.
+ */
+package com.datadog.android.trace.api.span
+
+/**
+ * A writer is responsible to send collected spans to some place.
+ * This wrapper is required to no expose CoreTracer wrapper to dependant modules
+ * */
+interface DatadogSpanWriter

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/trace/DatadogTraceId.kt

@@ -13,18 +13,5 @@ import com.datadog.tools.annotation.NoOpImplementation
  * This interface is typically used with a factory (`DatadogTraceIdFactory`) to generate or retrieve trace IDs.
  */
 @NoOpImplementation
-interface DatadogTraceId {
-    /**
-     * Converts the Datadog trace ID to its numeric representation as a `Long`.
-     *
-     * @return the numeric value of the trace ID as a `Long`.
-     */
-    fun toLong(): Long
+interface DatadogTraceId
 
-    /**
-     * Converts the current trace ID into its hexadecimal string representation.
-     *
-     * @return the hexadecimal string representation of the trace ID.
-     */
-    fun toHexString(): String
-}

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/trace/DatadogTraceIdFactory.kt renamed to features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/trace/DatadogTraceIdConverter.kt

@@ -8,7 +8,7 @@ package com.datadog.android.trace.api.trace
 /**
  * Factory interface for creating and manipulating `DatadogTraceId` instances.
  */
-interface DatadogTraceIdFactory {
+interface DatadogTraceIdConverter {
     /**
      * Creates a [DatadogTraceId] instance representing the zero value.
      *
@@ -39,4 +39,18 @@ interface DatadogTraceIdFactory {
      * @return a [DatadogTraceId] instance representing the given trace ID.
      */
     fun fromHex(id: String): DatadogTraceId
+
+    /**
+     * Converts the Datadog trace ID to its numeric representation as a `Long`.
+     *
+     * @return the numeric value of the trace ID as a `Long`.
+     */
+    fun toLong(traceId: DatadogTraceId): Long
+
+    /**
+     * Converts the current trace ID into its hexadecimal string representation.
+     *
+     * @return the hexadecimal string representation of the trace ID.
+     */
+    fun toHexString(traceId: DatadogTraceId): String
 }

features/dd-sdk-android-trace-api/src/main/kotlin/com/datadog/android/trace/api/tracer/DatadogTracerBuilder.kt

@@ -9,7 +9,6 @@ import androidx.annotation.FloatRange
 import androidx.annotation.IntRange
 import com.datadog.android.trace.TracingHeaderType
 import com.datadog.tools.annotation.NoOpImplementation
-import java.util.Properties
 
 /**
  * Builder interface for creating and configuring a [DatadogTracer] instance.
@@ -24,15 +23,6 @@ interface DatadogTracerBuilder {
      */
     fun build(): DatadogTracer
 
-    /**
-     * Configures the builder with the provided set of properties.
-     *
-     * @param properties The properties to configure the Datadog Tracer with. These properties could define
-     * specific behaviors or configurations that the tracer should utilize.
-     * @return The updated instance of [DatadogTracerBuilder] to allow method chaining.
-     */
-    fun withProperties(properties: Properties): DatadogTracerBuilder
-
     /**
      * Configures the builder with the specified set of tracing header types. Tracing headers
      * define the standards used for propagating trace information across different components.
@@ -53,15 +43,6 @@ interface DatadogTracerBuilder {
      */
     fun withServiceName(serviceName: String): DatadogTracerBuilder
 
-    /**
-     * Configures the builder with a specific ID generation strategy.
-     *
-     * @param key The key representing the strategy to be used for generating IDs.
-     * @param traceId128BitGenerationEnabled A flag indicating whether 128-bit trace ID generation should be enabled.
-     * @return The updated instance of [DatadogTracerBuilder] to allow method chaining.
-     */
-    fun withIdGenerationStrategy(key: String, traceId128BitGenerationEnabled: Boolean): DatadogTracerBuilder
-
     /**
      * Sets the sample rate of spans.
      * @param sampleRate the sample rate as a percentage between 0 and 100 (default is 100%)

features/dd-sdk-android-trace-otel/src/main/java/com/datadog/opentelemetry/trace/OtelExtractedContext.java

@@ -13,7 +13,7 @@
 import com.datadog.android.trace.api.trace.DatadogTraceId;
 import com.datadog.android.trace.api.DatadogTracingConstants;
 import com.datadog.android.trace.api.span.DatadogSpanContext;
-import com.datadog.android.trace.impl.internal.DatadogTracingInternal;
+import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
 
 import java.util.Collections;
 import java.util.Locale;
@@ -29,8 +29,8 @@ public class OtelExtractedContext implements DatadogSpanContext {
     private final int prioritySampling;
 
     private OtelExtractedContext(SpanContext context) {
-        traceId = DatadogTracingInternal.traceIdFactory.fromHex(context.getTraceId());
-        spanId = DatadogTracingInternal.spanIdConverter.fromHex(context.getSpanId());
+        traceId = DatadogTracingInternalToolkit.traceIdConverter.fromHex(context.getTraceId());
+        spanId = DatadogTracingInternalToolkit.spanIdConverter.fromHex(context.getSpanId());
         prioritySampling = context.isSampled()
                 ? DatadogTracingConstants.PrioritySampling.SAMPLER_KEEP
                 : DatadogTracingConstants.PrioritySampling.UNSET;

features/dd-sdk-android-trace-otel/src/main/java/com/datadog/opentelemetry/trace/OtelSpanContext.java

@@ -10,7 +10,7 @@
 
 import com.datadog.android.trace.api.span.DatadogSpan;
 import com.datadog.android.trace.api.span.DatadogSpanContext;
-import com.datadog.android.trace.impl.internal.DatadogTracingInternal;
+import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
 
 import io.opentelemetry.api.trace.SpanContext;
 import io.opentelemetry.api.trace.TraceFlags;
@@ -47,15 +47,15 @@ public static SpanContext fromRemote(DatadogSpanContext extracted, TraceState tr
   @Override
   public String getTraceId() {
     if (this.traceId == null) {
-      this.traceId = this.delegate.getTraceId().toHexString();
+      this.traceId = DatadogTracingInternalToolkit.traceIdConverter.toHexString(this.delegate.getTraceId());
     }
     return this.traceId;
   }
 
   @Override
   public String getSpanId() {
     if (this.spanId == null) {
-      this.spanId = DatadogTracingInternal.spanIdConverter.toHexStringPadded(this.delegate.getSpanId());
+      this.spanId = DatadogTracingInternalToolkit.spanIdConverter.toHexStringPadded(this.delegate.getSpanId());
     }
     return this.spanId;
   }

features/dd-sdk-android-trace-otel/src/main/java/com/datadog/opentelemetry/trace/OtelSpanLink.java

@@ -6,14 +6,13 @@
 
 package com.datadog.opentelemetry.trace;
 
-import static java.util.Objects.requireNonNull;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 
 import com.datadog.android.trace.api.span.DatadogSpanLink;
 import com.datadog.android.trace.api.trace.DatadogTraceId;
-import com.datadog.android.trace.impl.internal.DatadogTracingInternal;
+import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
 import com.datadog.opentelemetry.context.propagation.TraceStateHelper;
 
 import java.util.Collections;
@@ -35,8 +34,8 @@ public OtelSpanLink(SpanContext spanContext) {
   }
 
   public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
-    traceId = DatadogTracingInternal.traceIdFactory.fromHex(spanContext.getTraceId());
-    spanId = DatadogTracingInternal.spanIdConverter.fromHex(spanContext.getSpanId());
+    traceId = DatadogTracingInternalToolkit.traceIdConverter.fromHex(spanContext.getTraceId());
+    spanId = DatadogTracingInternalToolkit.spanIdConverter.fromHex(spanContext.getSpanId());
     sampled = spanContext.isSampled();
     traceState = TraceStateHelper.encodeHeader(spanContext.getTraceState());
     this.attributes = convertAttributes(attributes);
@@ -112,8 +111,7 @@ public String getTraceStrace() {
   }
 
   private static <T> void putArray(Map<String, String> attributes, String key, List<T> array) {
-    requireNonNull(key, "key must not be null");
-    if (array != null) {
+    if (key != null && array != null) {
       for (int index = 0; index < array.size(); index++) {
         Object value = array.get(index);
         if (value != null) {