Skip to content

Commit 90edcf0

Browse files
committed
RUM-99899 - merge develop
1 parent cba02e5 commit 90edcf0

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,6 @@ public final class com/datadog/android/trace/AndroidTracer$Companion {
2626
public final fun logThrowable (Lio/opentracing/Span;Ljava/lang/Throwable;)V
2727
}
2828

29-
public final class com/datadog/android/trace/DatadogTracer {
30-
public fun <init> ()V
31-
}
32-
3329
public abstract interface class com/datadog/android/trace/InternalCoreWriterProvider {
3430
public abstract fun getCoreTracerWriter ()Lcom/datadog/trace/common/writer/Writer;
3531
}

integrations/dd-sdk-android-okhttp/src/main/kotlin/com/datadog/android/okhttp/trace/TracingInterceptor.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,11 @@ internal constructor(
431431
}
432432
}
433433

434-
private fun handleDatadogSampledOutHeaders(requestBuilder: Request.Builder, span: AgentSpan, tracer: AgentTracer.TracerAPI) {
434+
private fun handleDatadogSampledOutHeaders(
435+
requestBuilder: Request.Builder,
436+
span: AgentSpan,
437+
tracer: AgentTracer.TracerAPI
438+
) {
435439
if (traceContextInjection == TraceContextInjection.ALL) {
436440
tracer.propagate().inject(
437441
span.context(),

0 commit comments

Comments
 (0)