Skip to content

Commit ee8a6ec

Browse files
0xnm0xnm
committed
RUM-10489: Make attributes argument optional in the event-related methods of RUM monitor
1 parent 809abcb commit ee8a6ec

File tree

26 files changed

+149
-159
lines changed

26 files changed

+149
-159
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,15 @@ interface com.datadog.android.rum.RumMonitor
103103
fun getCurrentSessionId((String?) -> Unit)
104104
fun startView(Any, String, Map<String, Any?> = emptyMap())
105105
fun stopView(Any, Map<String, Any?> = emptyMap())
106-
fun addAction(RumActionType, String, Map<String, Any?>)
107-
fun startAction(RumActionType, String, Map<String, Any?>)
106+
fun addAction(RumActionType, String, Map<String, Any?> = emptyMap())
107+
fun startAction(RumActionType, String, Map<String, Any?> = emptyMap())
108108
fun stopAction(RumActionType, String, Map<String, Any?> = emptyMap())
109109
fun startResource(String, RumResourceMethod, String, Map<String, Any?> = emptyMap())
110-
fun stopResource(String, Int?, Long?, RumResourceKind, Map<String, Any?>)
110+
fun stopResource(String, Int?, Long?, RumResourceKind, Map<String, Any?> = emptyMap())
111111
fun stopResourceWithError(String, Int?, String, RumErrorSource, Throwable, Map<String, Any?> = emptyMap())
112112
fun stopResourceWithError(String, Int?, String, RumErrorSource, String, String?, Map<String, Any?> = emptyMap())
113-
fun addError(String, RumErrorSource, Throwable?, Map<String, Any?>)
114-
fun addErrorWithStacktrace(String, RumErrorSource, String?, Map<String, Any?>)
113+
fun addError(String, RumErrorSource, Throwable?, Map<String, Any?> = emptyMap())
114+
fun addErrorWithStacktrace(String, RumErrorSource, String?, Map<String, Any?> = emptyMap())
115115
fun addTiming(String)
116116
fun addFeatureFlagEvaluation(String, Any)
117117
fun addFeatureFlagEvaluations(Map<String, Any>)
@@ -188,7 +188,7 @@ interface com.datadog.android.rum.internal.monitor.AdvancedNetworkRumMonitor : c
188188
fun addResourceTiming(Any, com.datadog.android.rum.internal.domain.event.ResourceTiming)
189189
fun notifyInterceptorInstantiated()
190190
fun startResource(com.datadog.android.rum.resource.ResourceId, com.datadog.android.rum.RumResourceMethod, String, Map<String, Any?> = emptyMap())
191-
fun stopResource(com.datadog.android.rum.resource.ResourceId, Int?, Long?, com.datadog.android.rum.RumResourceKind, Map<String, Any?>)
191+
fun stopResource(com.datadog.android.rum.resource.ResourceId, Int?, Long?, com.datadog.android.rum.RumResourceKind, Map<String, Any?> = emptyMap())
192192
fun stopResourceWithError(com.datadog.android.rum.resource.ResourceId, Int?, String, com.datadog.android.rum.RumErrorSource, Throwable, Map<String, Any?> = emptyMap())
193193
fun stopResourceWithError(com.datadog.android.rum.resource.ResourceId, Int?, String, com.datadog.android.rum.RumErrorSource, String, String?, Map<String, Any?> = emptyMap())
194194
interface com.datadog.android.rum.metric.interactiontonextview.LastInteractionIdentifier

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,14 @@ public abstract interface class com/datadog/android/rum/RumMonitor {
175175
}
176176

177177
public final class com/datadog/android/rum/RumMonitor$DefaultImpls {
178+
public static synthetic fun addAction$default (Lcom/datadog/android/rum/RumMonitor;Lcom/datadog/android/rum/RumActionType;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
179+
public static synthetic fun addError$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
180+
public static synthetic fun addErrorWithStacktrace$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
181+
public static synthetic fun startAction$default (Lcom/datadog/android/rum/RumMonitor;Lcom/datadog/android/rum/RumActionType;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
178182
public static synthetic fun startResource$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Lcom/datadog/android/rum/RumResourceMethod;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
179183
public static synthetic fun startView$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/Object;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
180184
public static synthetic fun stopAction$default (Lcom/datadog/android/rum/RumMonitor;Lcom/datadog/android/rum/RumActionType;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
185+
public static synthetic fun stopResource$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/Long;Lcom/datadog/android/rum/RumResourceKind;Ljava/util/Map;ILjava/lang/Object;)V
181186
public static synthetic fun stopResourceWithError$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
182187
public static synthetic fun stopResourceWithError$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/String;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
183188
public static synthetic fun stopView$default (Lcom/datadog/android/rum/RumMonitor;Ljava/lang/Object;Ljava/util/Map;ILjava/lang/Object;)V
@@ -328,6 +333,7 @@ public abstract interface class com/datadog/android/rum/internal/monitor/Advance
328333

329334
public final class com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor$DefaultImpls {
330335
public static synthetic fun startResource$default (Lcom/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor;Lcom/datadog/android/rum/resource/ResourceId;Lcom/datadog/android/rum/RumResourceMethod;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
336+
public static synthetic fun stopResource$default (Lcom/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor;Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/Long;Lcom/datadog/android/rum/RumResourceKind;Ljava/util/Map;ILjava/lang/Object;)V
331337
public static synthetic fun stopResourceWithError$default (Lcom/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor;Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;ILjava/lang/Object;)V
332338
public static synthetic fun stopResourceWithError$default (Lcom/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor;Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/Throwable;Ljava/util/Map;ILjava/lang/Object;)V
333339
}

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/RumMonitor.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ interface RumMonitor {
7272
fun addAction(
7373
type: RumActionType,
7474
name: String,
75-
attributes: Map<String, Any?>
75+
attributes: Map<String, Any?> = emptyMap()
7676
)
7777

7878
/**
@@ -90,7 +90,7 @@ interface RumMonitor {
9090
fun startAction(
9191
type: RumActionType,
9292
name: String,
93-
attributes: Map<String, Any?>
93+
attributes: Map<String, Any?> = emptyMap()
9494
)
9595

9696
/**
@@ -145,7 +145,7 @@ interface RumMonitor {
145145
statusCode: Int?,
146146
size: Long?,
147147
kind: RumResourceKind,
148-
attributes: Map<String, Any?>
148+
attributes: Map<String, Any?> = emptyMap()
149149
)
150150

151151
/**
@@ -216,7 +216,7 @@ interface RumMonitor {
216216
message: String,
217217
source: RumErrorSource,
218218
throwable: Throwable?,
219-
attributes: Map<String, Any?>
219+
attributes: Map<String, Any?> = emptyMap()
220220
)
221221

222222
/**
@@ -237,7 +237,7 @@ interface RumMonitor {
237237
message: String,
238238
source: RumErrorSource,
239239
stacktrace: String?,
240-
attributes: Map<String, Any?>
240+
attributes: Map<String, Any?> = emptyMap()
241241
)
242242

243243
/**

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/instrumentation/gestures/WindowCallbackWrapper.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ internal class WindowCallbackWrapper(
147147
} else {
148148
customTargetName
149149
}
150-
GlobalRumMonitor.get(sdkCore).addAction(RumActionType.BACK, targetName, emptyMap())
150+
GlobalRumMonitor.get(sdkCore).addAction(RumActionType.BACK, targetName)
151151
}
152152

153153
private fun logOrRethrowWrappedCallbackException(e: NullPointerException) {

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ interface AdvancedNetworkRumMonitor : RumMonitor {
6868
statusCode: Int?,
6969
size: Long?,
7070
kind: RumResourceKind,
71-
attributes: Map<String, Any?>
71+
attributes: Map<String, Any?> = emptyMap()
7272
)
7373

7474
/**

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/utils/CloasableErrorExt.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,5 @@ import com.datadog.android.rum.RumErrorSource
1313
internal const val CLOSABLE_ERROR_MESSAGE = "Error while using the closeable"
1414

1515
internal fun handleClosableError(throwable: Throwable, sdkCore: SdkCore) {
16-
GlobalRumMonitor.get(sdkCore).addError(CLOSABLE_ERROR_MESSAGE, RumErrorSource.SOURCE, throwable, emptyMap())
16+
GlobalRumMonitor.get(sdkCore).addError(CLOSABLE_ERROR_MESSAGE, RumErrorSource.SOURCE, throwable)
1717
}

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/resource/RumResourceInputStream.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ constructor(
4545

4646
init {
4747
val rumMonitor = GlobalRumMonitor.get(sdkCore)
48-
rumMonitor.startResource(key, METHOD, url, emptyMap())
48+
rumMonitor.startResource(key, METHOD, url)
4949
callStart = System.nanoTime()
5050
if (rumMonitor is AdvancedRumMonitor) {
5151
rumMonitor.waitForResourceTiming(key)
@@ -145,8 +145,7 @@ constructor(
145145
key,
146146
null,
147147
size,
148-
RumResourceKind.OTHER,
149-
emptyMap()
148+
RumResourceKind.OTHER
150149
)
151150
}
152151
}

‎instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/cross/CrossFeatureTest.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,11 @@ class CrossFeatureTest {
143143

144144
// When
145145
GlobalRumMonitor.get().startView(fakeRumViewName, fakeRumViewName)
146-
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
146+
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName)
147147
openTracingTracer.withinSpan(fakeOperationName) {
148148
logger.i(fakeLogMessage)
149149
}
150-
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
150+
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName)
151151
GlobalRumMonitor.get().stopView(fakeRumViewName)
152152

153153
// Then
@@ -199,8 +199,8 @@ class CrossFeatureTest {
199199
logger.i(fakeLogMessage)
200200
}
201201
GlobalRumMonitor.get().startView(fakeRumViewName, fakeRumViewName)
202-
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
203-
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
202+
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName)
203+
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName)
204204
GlobalRumMonitor.get().stopView(fakeRumViewName)
205205

206206
// Then
@@ -244,8 +244,8 @@ class CrossFeatureTest {
244244

245245
// When
246246
GlobalRumMonitor.get().startView(fakeRumViewName, fakeRumViewName)
247-
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
248-
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName, attributes = emptyMap())
247+
GlobalRumMonitor.get().startAction(RumActionType.TAP, fakeRumActionName)
248+
GlobalRumMonitor.get().stopAction(RumActionType.TAP, fakeRumActionName)
249249
GlobalRumMonitor.get().stopView(fakeRumViewName)
250250
openTracingTracer.withinSpan(fakeOperationName) {
251251
logger.i(fakeLogMessage)

‎instrumented/integration/src/androidTest/kotlin/com/datadog/android/sdk/integration/security/EncryptionTest.kt

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -177,17 +177,15 @@ internal class EncryptionTest {
177177

178178
rumMonitor.addAction(
179179
RumActionType.CUSTOM,
180-
"rumAction-${forge.aString()}",
181-
emptyMap()
180+
"rumAction-${forge.aString()}"
182181
)
183182
logger.w("Action added")
184183

185184
rumMonitor.stopResource(
186185
resourceName,
187186
forge.anInt(100, 600),
188187
forge.aLong(min = 0L),
189-
forge.aValueFrom(RumResourceKind::class.java),
190-
attributes = emptyMap()
188+
forge.aValueFrom(RumResourceKind::class.java)
191189
)
192190

193191
span.finish()

‎integrations/dd-sdk-android-compose/src/main/kotlin/com/datadog/android/compose/internal/InternalInteractionTracking.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ internal suspend fun trackSwipe(
3939
@Suppress("UnsafeThirdPartyFunctionCall")
4040
interactionType.offset.roundToInt()
4141
)
42-
rumMonitor.startAction(RumActionType.SWIPE, targetName, emptyMap())
42+
rumMonitor.startAction(RumActionType.SWIPE, targetName)
4343
},
4444
onStopOrCancel = { startProps ->
4545
reportSwipeInteraction(
@@ -70,7 +70,7 @@ internal suspend fun trackScroll(
7070
ScrollStartProps(
7171
interactionType.scrollableState.currentPosition
7272
)
73-
rumMonitor.startAction(RumActionType.SCROLL, targetName, emptyMap())
73+
rumMonitor.startAction(RumActionType.SCROLL, targetName)
7474
},
7575
onStopOrCancel = { startProps ->
7676
reportScrollInteraction(

0 commit comments

Comments
 (0)