Skip to content

Commit 4164398

Browse files
RUM-9509: PR fixes
1 parent 62d43d1 commit 4164398

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

sample/benchmark/src/main/java/com/datadog/benchmark/sample/di/activity/OpenTelemetryModule.kt

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ package com.datadog.benchmark.sample.di.activity
88

99
import com.datadog.android.api.SdkCore
1010
import com.datadog.android.trace.opentelemetry.OtelTracerProvider
11+
import com.datadog.benchmark.sample.config.BenchmarkConfig
12+
import com.datadog.benchmark.sample.config.SyntheticsRun
13+
import com.datadog.benchmark.sample.config.SyntheticsScenario
1114
import dagger.Module
1215
import dagger.Provides
1316
import io.opentelemetry.api.OpenTelemetry
@@ -21,9 +24,16 @@ internal interface OpenTelemetryModule {
2124
@Provides
2225
@BenchmarkActivityScope
2326
fun provideOpenTelemetry(
24-
sdkCore: SdkCore
27+
sdkCore: SdkCore,
28+
config: BenchmarkConfig
2529
): OpenTelemetry {
26-
val tracerProvider = OtelTracerProvider.Builder(sdkCore).build()
30+
val isTracingEnabled = config.run == SyntheticsRun.Instrumented &&
31+
config.scenario == SyntheticsScenario.Trace
32+
33+
val tracerProvider = when (isTracingEnabled) {
34+
true -> OtelTracerProvider.Builder(sdkCore).build()
35+
false -> TracerProvider.noop()
36+
}
2737

2838
return object : OpenTelemetry {
2939
override fun getTracerProvider(): TracerProvider {

sample/benchmark/src/main/java/com/datadog/benchmark/sample/ui/trace/TraceScenarioViewModel.kt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ internal class TraceScenarioViewModel(
8181
) : ViewModel() {
8282
private val actions = Channel<TraceScenarioScreenAction>(UNLIMITED)
8383

84-
private val _traceScenarioState: StateFlow<TraceScenarioScreenState> = actions
84+
val traceScenarioState: StateFlow<TraceScenarioScreenState> = actions
8585
.receiveAsFlow()
8686
.scan(TraceScenarioScreenState.INITIAL, ::processAction)
8787
.flowOn(defaultDispatcher)
@@ -91,8 +91,6 @@ internal class TraceScenarioViewModel(
9191
initialValue = TraceScenarioScreenState.INITIAL
9292
)
9393

94-
val traceScenarioState: StateFlow<TraceScenarioScreenState> = _traceScenarioState
95-
9694
fun dispatch(action: TraceScenarioScreenAction) {
9795
actions.trySend(action)
9896
}

0 commit comments

Comments
 (0)