Skip to content

Commit b9a4339

Browse files
satweensatween
committed
RUM-9902: post review fixes
1 parent bee3881 commit b9a4339

File tree

62 files changed

+186
-222
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+186
-222
lines changed

‎dd-sdk-android-internal/api/apiSurface

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ class com.datadog.android.internal.thread.NamedRunnable : NamedExecutionUnit, Ru
8282
class com.datadog.android.internal.thread.NamedCallable<V> : NamedExecutionUnit, java.util.concurrent.Callable<V>
8383
constructor(String, java.util.concurrent.Callable<V>)
8484
fun ByteArray.toHexString(): String
85-
fun <R> Any.tryCastTo(): R?
8685
object com.datadog.android.internal.utils.ImageViewUtils
8786
fun resolveParentRectAbsPosition(android.view.View, Boolean = true): android.graphics.Rect
8887
fun calculateClipping(android.graphics.Rect, android.graphics.Rect, Float): android.graphics.Rect

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ object com.datadog.android.trace.api.DatadogTracingConstants
1313
const val VALUE_SPAN_KIND_PRODUCER: String
1414
const val VALUE_SPAN_KIND_CONSUMER: String
1515
const val KEY_ANALYTICS_SAMPLE_RATE: String
16+
const val RESOURCE_NAME: String
17+
const val ERROR_MSG: String
18+
const val ERROR_TYPE: String
1619
object PrioritySampling
1720
const val UNSET: Int
1821
const val SAMPLER_DROP: Int
@@ -40,10 +43,6 @@ object com.datadog.android.trace.api.DatadogTracingConstants
4043
const val UNSET: Byte
4144
const val HTTP_SERVER_DECORATOR: Byte
4245
const val DEFAULT: Byte
43-
object DDTags
44-
const val RESOURCE_NAME: String
45-
const val ERROR_MSG: String
46-
const val ERROR_TYPE: String
4746
interface com.datadog.android.trace.api.propagation.DatadogPropagation
4847
fun <C> inject(com.datadog.android.trace.api.span.DatadogSpanContext, C, (C) -> Unit)
4948
fun <C> extract(C, (C) -> Unit): com.datadog.android.trace.api.span.DatadogSpanContext?
@@ -64,7 +63,7 @@ interface com.datadog.android.trace.api.span.DatadogSpan
6463
var serviceName: String
6564
var operationName: String
6665
val durationNano: Long
67-
val startTimeNano: Long
66+
val startTimeNanos: Long
6867
val localRootSpan: DatadogSpan?
6968
fun context(): DatadogSpanContext
7069
fun finish()

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,6 @@ public final class com/datadog/android/trace/api/DatadogTracingConstants {
33
public static final field INSTANCE Lcom/datadog/android/trace/api/DatadogTracingConstants;
44
}
55

6-
public final class com/datadog/android/trace/api/DatadogTracingConstants$DDTags {
7-
public static final field ERROR_MSG Ljava/lang/String;
8-
public static final field ERROR_TYPE Ljava/lang/String;
9-
public static final field INSTANCE Lcom/datadog/android/trace/api/DatadogTracingConstants$DDTags;
10-
public static final field RESOURCE_NAME Ljava/lang/String;
11-
}
12-
136
public final class com/datadog/android/trace/api/DatadogTracingConstants$ErrorPriorities {
147
public static final field DEFAULT B
158
public static final field HTTP_SERVER_DECORATOR B
@@ -37,6 +30,8 @@ public final class com/datadog/android/trace/api/DatadogTracingConstants$Priorit
3730
}
3831

3932
public final class com/datadog/android/trace/api/DatadogTracingConstants$Tags {
33+
public static final field ERROR_MSG Ljava/lang/String;
34+
public static final field ERROR_TYPE Ljava/lang/String;
4035
public static final field INSTANCE Lcom/datadog/android/trace/api/DatadogTracingConstants$Tags;
4136
public static final field KEY_ANALYTICS_SAMPLE_RATE Ljava/lang/String;
4237
public static final field KEY_ERROR_MSG Ljava/lang/String;
@@ -46,6 +41,7 @@ public final class com/datadog/android/trace/api/DatadogTracingConstants$Tags {
4641
public static final field KEY_HTTP_STATUS Ljava/lang/String;
4742
public static final field KEY_HTTP_URL Ljava/lang/String;
4843
public static final field KEY_SPAN_KIND Ljava/lang/String;
44+
public static final field RESOURCE_NAME Ljava/lang/String;
4945
public static final field VALUE_SPAN_KIND_CLIENT Ljava/lang/String;
5046
public static final field VALUE_SPAN_KIND_CONSUMER Ljava/lang/String;
5147
public static final field VALUE_SPAN_KIND_PRODUCER Ljava/lang/String;
@@ -101,7 +97,7 @@ public abstract interface class com/datadog/android/trace/api/span/DatadogSpan {
10197
public abstract fun getResourceName ()Ljava/lang/String;
10298
public abstract fun getSamplingPriority ()Ljava/lang/Integer;
10399
public abstract fun getServiceName ()Ljava/lang/String;
104-
public abstract fun getStartTimeNano ()J
100+
public abstract fun getStartTimeNanos ()J
105101
public abstract fun getTag (Ljava/lang/String;)Ljava/lang/Object;
106102
public abstract fun getTraceId ()Lcom/datadog/android/trace/api/trace/DatadogTraceId;
107103
public abstract fun isError ()Ljava/lang/Boolean;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ object DatadogTracingConstants {
2121
* Contains constants used for tagging spans in the Datadog tracer.
2222
*/
2323
object Tags {
24-
/** The URL of the HTTP request. (String)*/
24+
/** The URL of the HTTP request. */
2525
const val KEY_HTTP_URL: String = "http.url"
2626

2727
/**

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.datadog.android.trace.api.trace.DatadogTraceId;
1414
import com.datadog.android.trace.api.DatadogTracingConstants;
1515
import com.datadog.android.trace.api.span.DatadogSpanContext;
16-
import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
16+
import com.datadog.android.trace.internal.DatadogTracingToolkit;
1717

1818
import java.util.Collections;
1919
import java.util.Locale;
@@ -29,8 +29,8 @@ public class OtelExtractedContext implements DatadogSpanContext {
2929
private final int prioritySampling;
3030

3131
private OtelExtractedContext(SpanContext context) {
32-
traceId = DatadogTracingInternalToolkit.traceIdConverter.fromHex(context.getTraceId());
33-
spanId = DatadogTracingInternalToolkit.spanIdConverter.fromHex(context.getSpanId());
32+
traceId = DatadogTracingToolkit.traceIdConverter.fromHex(context.getTraceId());
33+
spanId = DatadogTracingToolkit.spanIdConverter.fromHex(context.getSpanId());
3434
prioritySampling = context.isSampled()
3535
? DatadogTracingConstants.PrioritySampling.SAMPLER_KEEP
3636
: DatadogTracingConstants.PrioritySampling.UNSET;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
import com.datadog.android.trace.api.span.DatadogSpan;
1212
import com.datadog.android.trace.api.span.DatadogSpanContext;
13-
import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
13+
import com.datadog.android.trace.internal.DatadogTracingToolkit;
1414

1515
import io.opentelemetry.api.trace.SpanContext;
1616
import io.opentelemetry.api.trace.TraceFlags;
@@ -47,15 +47,15 @@ public static SpanContext fromRemote(DatadogSpanContext extracted, TraceState tr
4747
@Override
4848
public String getTraceId() {
4949
if (this.traceId == null) {
50-
this.traceId = DatadogTracingInternalToolkit.traceIdConverter.toHexString(this.delegate.getTraceId());
50+
this.traceId = DatadogTracingToolkit.traceIdConverter.toHexString(this.delegate.getTraceId());
5151
}
5252
return this.traceId;
5353
}
5454

5555
@Override
5656
public String getSpanId() {
5757
if (this.spanId == null) {
58-
this.spanId = DatadogTracingInternalToolkit.spanIdConverter.toHexStringPadded(this.delegate.getSpanId());
58+
this.spanId = DatadogTracingToolkit.spanIdConverter.toHexStringPadded(this.delegate.getSpanId());
5959
}
6060
return this.spanId;
6161
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
import com.datadog.android.trace.api.span.DatadogSpanLink;
1414
import com.datadog.android.trace.api.trace.DatadogTraceId;
15-
import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit;
15+
import com.datadog.android.trace.internal.DatadogTracingToolkit;
1616
import com.datadog.opentelemetry.context.propagation.TraceStateHelper;
1717

1818
import java.util.Collections;
@@ -34,8 +34,8 @@ public OtelSpanLink(SpanContext spanContext) {
3434
}
3535

3636
public OtelSpanLink(SpanContext spanContext, io.opentelemetry.api.common.Attributes attributes) {
37-
traceId = DatadogTracingInternalToolkit.traceIdConverter.fromHex(spanContext.getTraceId());
38-
spanId = DatadogTracingInternalToolkit.spanIdConverter.fromHex(spanContext.getSpanId());
37+
traceId = DatadogTracingToolkit.traceIdConverter.fromHex(spanContext.getTraceId());
38+
spanId = DatadogTracingToolkit.spanIdConverter.fromHex(spanContext.getSpanId());
3939
sampled = spanContext.isSampled();
4040
traceState = TraceStateHelper.encodeHeader(spanContext.getTraceState());
4141
this.attributes = convertAttributes(attributes);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ import com.datadog.android.trace.GlobalDatadogTracer
1717
import com.datadog.android.trace.InternalCoreWriterProvider
1818
import com.datadog.android.trace.TracingHeaderType
1919
import com.datadog.android.trace.api.tracer.DatadogTracer
20-
import com.datadog.android.trace.impl.DatadogTracing
21-
import com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit.setTraceId128BitGenerationEnabled
20+
import com.datadog.android.trace.DatadogTracing
21+
import com.datadog.android.trace.internal.DatadogTracingToolkit.setTraceId128BitGenerationEnabled
2222
import com.datadog.android.trace.opentelemetry.internal.DatadogContextStorageWrapper
2323
import com.datadog.android.trace.opentelemetry.internal.executeIfJavaFunctionPackageExists
2424
import com.datadog.opentelemetry.trace.OtelTracerBuilder

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
object com.datadog.android.trace.GlobalDatadogTracerHolder
1+
object com.datadog.android.trace.DatadogTracing
2+
fun newTracerBuilder(com.datadog.android.api.SdkCore = Datadog.getInstance()): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
3+
object com.datadog.android.trace.GlobalDatadogTracer
24
fun registerIfAbsent(com.datadog.android.trace.api.tracer.DatadogTracer): Boolean
35
fun get(): com.datadog.android.trace.api.tracer.DatadogTracer
46
fun getOrNull(): com.datadog.android.trace.api.tracer.DatadogTracer?
@@ -20,19 +22,17 @@ data class com.datadog.android.trace.TraceConfiguration
2022
fun build(): TraceConfiguration
2123
interface com.datadog.android.trace.event.SpanEventMapper : com.datadog.android.event.EventMapper<com.datadog.android.trace.model.SpanEvent>
2224
override fun map(com.datadog.android.trace.model.SpanEvent): com.datadog.android.trace.model.SpanEvent
23-
object com.datadog.android.trace.impl.DatadogTracing
24-
fun newTracerBuilder(com.datadog.android.api.SdkCore = Datadog.getInstance()): com.datadog.android.trace.api.tracer.DatadogTracerBuilder
25-
interface com.datadog.android.trace.impl.internal.DatadogSpanIdConverter
25+
interface com.datadog.android.trace.internal.DatadogSpanIdConverter
2626
fun fromHex(String): Long
2727
fun toHexStringPadded(Long): String
28-
interface com.datadog.android.trace.impl.internal.DatadogTraceIdConverter
28+
interface com.datadog.android.trace.internal.DatadogTraceIdConverter
2929
fun zero(): com.datadog.android.trace.api.trace.DatadogTraceId
3030
fun from(Long): com.datadog.android.trace.api.trace.DatadogTraceId
3131
fun from(String): com.datadog.android.trace.api.trace.DatadogTraceId
3232
fun fromHex(String): com.datadog.android.trace.api.trace.DatadogTraceId
3333
fun toLong(com.datadog.android.trace.api.trace.DatadogTraceId): Long
3434
fun toHexString(com.datadog.android.trace.api.trace.DatadogTraceId): String
35-
object com.datadog.android.trace.impl.internal.DatadogTracingInternalToolkit
35+
object com.datadog.android.trace.internal.DatadogTracingInternalToolkit
3636
val spanIdConverter: DatadogSpanIdConverter
3737
val traceIdConverter: DatadogTraceIdConverter
3838
var spanLogger: com.datadog.android.trace.api.span.DatadogSpanLogger

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
1-
public final class com/datadog/android/trace/GlobalDatadogTracerHolder {
2-
public static final field INSTANCE Lcom/datadog/android/trace/GlobalDatadogTracerHolder;
1+
public final class com/datadog/android/trace/DatadogTracing {
2+
public static final field INSTANCE Lcom/datadog/android/trace/DatadogTracing;
3+
public final fun newTracerBuilder (Lcom/datadog/android/api/SdkCore;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
4+
public static synthetic fun newTracerBuilder$default (Lcom/datadog/android/trace/DatadogTracing;Lcom/datadog/android/api/SdkCore;ILjava/lang/Object;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
5+
}
6+
7+
public final class com/datadog/android/trace/GlobalDatadogTracer {
8+
public static final field INSTANCE Lcom/datadog/android/trace/GlobalDatadogTracer;
39
public final fun clear ()V
410
public final fun get ()Lcom/datadog/android/trace/api/tracer/DatadogTracer;
511
public final fun getOrNull ()Lcom/datadog/android/trace/api/tracer/DatadogTracer;
@@ -46,18 +52,12 @@ public abstract interface class com/datadog/android/trace/event/SpanEventMapper
4652
public abstract fun map (Lcom/datadog/android/trace/model/SpanEvent;)Lcom/datadog/android/trace/model/SpanEvent;
4753
}
4854

49-
public final class com/datadog/android/trace/impl/DatadogTracing {
50-
public static final field INSTANCE Lcom/datadog/android/trace/impl/DatadogTracing;
51-
public final fun newTracerBuilder (Lcom/datadog/android/api/SdkCore;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
52-
public static synthetic fun newTracerBuilder$default (Lcom/datadog/android/trace/impl/DatadogTracing;Lcom/datadog/android/api/SdkCore;ILjava/lang/Object;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
53-
}
54-
55-
public abstract interface class com/datadog/android/trace/impl/internal/DatadogSpanIdConverter {
55+
public abstract interface class com/datadog/android/trace/internal/DatadogSpanIdConverter {
5656
public abstract fun fromHex (Ljava/lang/String;)J
5757
public abstract fun toHexStringPadded (J)Ljava/lang/String;
5858
}
5959

60-
public abstract interface class com/datadog/android/trace/impl/internal/DatadogTraceIdConverter {
60+
public abstract interface class com/datadog/android/trace/internal/DatadogTraceIdConverter {
6161
public abstract fun from (J)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
6262
public abstract fun from (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
6363
public abstract fun fromHex (Ljava/lang/String;)Lcom/datadog/android/trace/api/trace/DatadogTraceId;
@@ -66,10 +66,10 @@ public abstract interface class com/datadog/android/trace/impl/internal/DatadogT
6666
public abstract fun zero ()Lcom/datadog/android/trace/api/trace/DatadogTraceId;
6767
}
6868

69-
public final class com/datadog/android/trace/impl/internal/DatadogTracingInternalToolkit {
70-
public static final field INSTANCE Lcom/datadog/android/trace/impl/internal/DatadogTracingInternalToolkit;
71-
public static final field spanIdConverter Lcom/datadog/android/trace/impl/internal/DatadogSpanIdConverter;
72-
public static final field traceIdConverter Lcom/datadog/android/trace/impl/internal/DatadogTraceIdConverter;
69+
public final class com/datadog/android/trace/internal/DatadogTracingInternalToolkit {
70+
public static final field INSTANCE Lcom/datadog/android/trace/internal/DatadogTracingInternalToolkit;
71+
public static final field spanIdConverter Lcom/datadog/android/trace/internal/DatadogSpanIdConverter;
72+
public static final field traceIdConverter Lcom/datadog/android/trace/internal/DatadogTraceIdConverter;
7373
public final fun getSpanLogger ()Lcom/datadog/android/trace/api/span/DatadogSpanLogger;
7474
public final fun setTraceId128BitGenerationEnabled (Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;)Lcom/datadog/android/trace/api/tracer/DatadogTracerBuilder;
7575
public final fun setTracingSamplingPriorityIfNecessary (Lcom/datadog/android/trace/api/span/DatadogSpanContext;)V

0 commit comments

Comments
 (0)