RUM-9902: post review fixes

Author: satween

features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/telemetry/internal/TelemetryEventHandler.kt

@@ -440,17 +440,17 @@ internal class TelemetryEventHandler(
         // Would be nice to add the test with the flavor which is has no io.opentracing and test
         // for obfuscation enabled case.
         return try {
-            val globalDatadogTracerHolderClass =
-                Class.forName("com.datadog.android.trace.GlobalDatadogTracerHolder")
+            val globalDatadogTracer =
+                Class.forName("com.datadog.android.trace.GlobalDatadogTracer")
             return try {
-                val holderInstance = globalDatadogTracerHolderClass.getField("INSTANCE").get(null)
-                globalDatadogTracerHolderClass.getDeclaredMethod("getOrNull").invoke(holderInstance) != null
+                val holderInstance = globalDatadogTracer.getField("INSTANCE").get(null)
+                globalDatadogTracer.getDeclaredMethod("getOrNull").invoke(holderInstance) != null
             } catch (@Suppress("TooGenericExceptionCaught") t: Throwable) {
                 sdkCore.internalLogger.log(
                     InternalLogger.Level.ERROR,
                     InternalLogger.Target.TELEMETRY,
                     {
-                        "GlobalDatadogTracerHolder class exists in the runtime classpath, " +
+                        "GlobalDatadogTracer class exists in the runtime classpath, " +
                             "but there is an error invoking isRegistered method"
                     },
                     t

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

@@ -110,6 +110,10 @@ interface com.datadog.android.trace.api.span.DatadogSpanLogger
   fun log(Map<String, Any>, DatadogSpan)
 interface com.datadog.android.trace.api.span.DatadogSpanWriter
 interface com.datadog.android.trace.api.trace.DatadogTraceId
+  fun toHexStringPadded(Int): String
+  fun toHexString(): String
+  fun toLong(): Long
+  companion object 
 interface com.datadog.android.trace.api.tracer.DatadogTracer
   fun activeSpan(): com.datadog.android.trace.api.span.DatadogSpan?
   fun propagate(): com.datadog.android.trace.api.propagation.DatadogPropagation

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

@@ -164,6 +164,13 @@ public final class com/datadog/android/trace/api/span/NoOpDatadogSpanLogger : co
 }
 
 public abstract interface class com/datadog/android/trace/api/trace/DatadogTraceId {
+	public static final field Companion Lcom/datadog/android/trace/api/trace/DatadogTraceId$Companion;
+	public abstract fun toHexString ()Ljava/lang/String;
+	public abstract fun toHexStringPadded (I)Ljava/lang/String;
+	public abstract fun toLong ()J
+}
+
+public final class com/datadog/android/trace/api/trace/DatadogTraceId$Companion {
 }
 
 public abstract interface class com/datadog/android/trace/api/tracer/DatadogTracer {

features/dd-sdk-android-trace-api/build.gradle.kts

@@ -40,9 +40,6 @@ plugins {
 }
 
 android {
-    defaultConfig {
-        consumerProguardFiles("consumer-rules.pro")
-    }
     namespace = "com.datadog.android.trace.api"
 }
 

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

@@ -6,7 +6,7 @@
 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
+ * A writer is responsible for sending collected spans.
+ * This wrapper is required to not expose CoreTracer wrapper to dependent modules
  * */
 interface DatadogSpanWriter

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

@@ -9,8 +9,31 @@ import com.datadog.tools.annotation.NoOpImplementation
 
 /**
  * Represents a Datadog trace ID, which is a unique identifier for a specific trace.
- *
- * This interface is typically used with a factory (`DatadogTraceIdFactory`) to generate or retrieve trace IDs.
  */
 @NoOpImplementation
-interface DatadogTraceId
+interface DatadogTraceId {
+    /**
+     * Returns the lower-case zero-padded hexadecimal String representation of the trace ID.
+     * The size will be rounded up to 16 or 32 characters.
+     *
+     * @param size The size in characters of the zero-padded String (rounded up to 16 or 32)
+     * @return A lower-case zero-padded hexadecimal string representation of this trace ID
+     */
+    fun toHexStringPadded(size: Int): String
+
+    /**
+     * Converts the current trace ID into its hexadecimal string representation.
+     *
+     * @return the hexadecimal string representation of the trace ID.
+     */
+    fun toHexString(): String
+
+    /**
+     * 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
+
+    companion object
+}

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

@@ -10,9 +10,10 @@
 import androidx.annotation.Nullable;
 
 import com.datadog.android.api.InternalLogger;
-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.api.trace.DatadogTraceId;
+import com.datadog.android.trace.internal.DatadogTraceExtKt;
 import com.datadog.android.trace.internal.DatadogTracingToolkit;
 
 import java.util.Collections;
@@ -29,7 +30,7 @@ public class OtelExtractedContext implements DatadogSpanContext {
     private final int prioritySampling;
 
     private OtelExtractedContext(SpanContext context) {
-        traceId = DatadogTracingToolkit.traceIdConverter.fromHex(context.getTraceId());
+        traceId = DatadogTraceExtKt.fromHex(DatadogTraceId.Companion, context.getTraceId());
         spanId = DatadogTracingToolkit.spanIdConverter.fromHex(context.getSpanId());
         prioritySampling = context.isSampled()
                 ? DatadogTracingConstants.PrioritySampling.SAMPLER_KEEP

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

@@ -47,7 +47,7 @@ public static SpanContext fromRemote(DatadogSpanContext extracted, TraceState tr
   @Override
   public String getTraceId() {
     if (this.traceId == null) {
-      this.traceId = DatadogTracingToolkit.traceIdConverter.toHexString(this.delegate.getTraceId());
+      traceId = delegate.getTraceId().toHexString();
     }
     return this.traceId;
   }

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

@@ -12,6 +12,7 @@
 
 import com.datadog.android.trace.api.span.DatadogSpanLink;
 import com.datadog.android.trace.api.trace.DatadogTraceId;
+import com.datadog.android.trace.internal.DatadogTraceExtKt;
 import com.datadog.android.trace.internal.DatadogTracingToolkit;
 import com.datadog.opentelemetry.context.propagation.TraceStateHelper;
 
@@ -34,7 +35,7 @@ public OtelSpanLink(SpanContext spanContext) {
   }
 
   public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
-    traceId = DatadogTracingToolkit.traceIdConverter.fromHex(spanContext.getTraceId());
+    traceId = DatadogTraceExtKt.fromHex(DatadogTraceId.Companion, spanContext.getTraceId());
     spanId = DatadogTracingToolkit.spanIdConverter.fromHex(spanContext.getSpanId());
     sampled = spanContext.isSampled();
     traceState = TraceStateHelper.encodeHeader(spanContext.getTraceState());

features/dd-sdk-android-trace-otel/src/main/kotlin/com/datadog/android/trace/opentelemetry/OtelTracerProvider.kt

@@ -13,11 +13,11 @@ import com.datadog.android.api.InternalLogger
 import com.datadog.android.api.SdkCore
 import com.datadog.android.api.feature.Feature
 import com.datadog.android.api.feature.FeatureSdkCore
+import com.datadog.android.trace.DatadogTracing
 import com.datadog.android.trace.GlobalDatadogTracer
 import com.datadog.android.trace.InternalCoreWriterProvider
 import com.datadog.android.trace.TracingHeaderType
 import com.datadog.android.trace.api.tracer.DatadogTracer
-import com.datadog.android.trace.DatadogTracing
 import com.datadog.android.trace.internal.DatadogTracingToolkit.setTraceId128BitGenerationEnabled
 import com.datadog.android.trace.opentelemetry.internal.DatadogContextStorageWrapper
 import com.datadog.android.trace.opentelemetry.internal.executeIfJavaFunctionPackageExists