diff --git a/embrace-android-api/api/embrace-android-api.api b/embrace-android-api/api/embrace-android-api.api index 9d79655288..a466827b9c 100644 --- a/embrace-android-api/api/embrace-android-api.api +++ b/embrace-android-api/api/embrace-android-api.api @@ -53,17 +53,17 @@ public abstract interface class io/embrace/android/embracesdk/internal/api/Embra public abstract interface class io/embrace/android/embracesdk/internal/api/InstrumentationApi { public abstract fun activityLoaded (Landroid/app/Activity;)V - public abstract fun addAttributeToLoadTrace (Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V - public abstract fun addChildSpanToLoadTrace (Landroid/app/Activity;Ljava/lang/String;JJ)V - public abstract fun addChildSpanToLoadTrace (Landroid/app/Activity;Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V + public abstract fun addLoadTraceAttribute (Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V + public abstract fun addLoadTraceChildSpan (Landroid/app/Activity;Ljava/lang/String;JJ)V + public abstract fun addLoadTraceChildSpan (Landroid/app/Activity;Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public abstract fun addStartupChildSpan (Ljava/lang/String;JJ)V - public abstract fun addStartupChildSpan (Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public abstract fun addStartupTraceAttribute (Ljava/lang/String;Ljava/lang/String;)V + public abstract fun addStartupTraceChildSpan (Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public abstract fun getSdkCurrentTimeMs ()J } public final class io/embrace/android/embracesdk/internal/api/InstrumentationApi$DefaultImpls { - public static fun addChildSpanToLoadTrace (Lio/embrace/android/embracesdk/internal/api/InstrumentationApi;Landroid/app/Activity;Ljava/lang/String;JJ)V + public static fun addLoadTraceChildSpan (Lio/embrace/android/embracesdk/internal/api/InstrumentationApi;Landroid/app/Activity;Ljava/lang/String;JJ)V public static fun addStartupChildSpan (Lio/embrace/android/embracesdk/internal/api/InstrumentationApi;Ljava/lang/String;JJ)V } @@ -105,7 +105,7 @@ public abstract interface class io/embrace/android/embracesdk/internal/api/SdkAp } public final class io/embrace/android/embracesdk/internal/api/SdkApi$DefaultImpls { - public static fun addChildSpanToLoadTrace (Lio/embrace/android/embracesdk/internal/api/SdkApi;Landroid/app/Activity;Ljava/lang/String;JJ)V + public static fun addLoadTraceChildSpan (Lio/embrace/android/embracesdk/internal/api/SdkApi;Landroid/app/Activity;Ljava/lang/String;JJ)V public static fun addStartupChildSpan (Lio/embrace/android/embracesdk/internal/api/SdkApi;Ljava/lang/String;JJ)V public static fun createSpan (Lio/embrace/android/embracesdk/internal/api/SdkApi;Ljava/lang/String;Lio/embrace/android/embracesdk/spans/AutoTerminationMode;)Lio/embrace/android/embracesdk/spans/EmbraceSpan; public static fun recordCompletedSpan (Lio/embrace/android/embracesdk/internal/api/SdkApi;Ljava/lang/String;JJ)Z diff --git a/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/InstrumentationApi.kt b/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/InstrumentationApi.kt index 35cd7aa6d7..aaf4c3c5f8 100644 --- a/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/InstrumentationApi.kt +++ b/embrace-android-api/src/main/kotlin/io/embrace/android/embracesdk/internal/api/InstrumentationApi.kt @@ -26,17 +26,17 @@ public interface InstrumentationApi { /** * Add an attribute to the trace generated by the loading of the given [Activity] */ - public fun addAttributeToLoadTrace(activity: Activity, key: String, value: String) + public fun addLoadTraceAttribute(activity: Activity, key: String, value: String) /** * Add a successfully completed child span to the trace generated by the loading of the given [Activity] */ - public fun addChildSpanToLoadTrace( + public fun addLoadTraceChildSpan( activity: Activity, name: String, startTimeMs: Long, endTimeMs: Long, - ): Unit = addChildSpanToLoadTrace( + ): Unit = addLoadTraceChildSpan( activity = activity, name = name, startTimeMs = startTimeMs, @@ -50,7 +50,7 @@ public interface InstrumentationApi { * Add a completed child span to the trace generated by the loading of the given [Activity] with the given * attributes and span events. Specify an [ErrorCode] if the span didn't complete successfully. */ - public fun addChildSpanToLoadTrace( + public fun addLoadTraceChildSpan( activity: Activity, name: String, startTimeMs: Long, @@ -68,11 +68,11 @@ public interface InstrumentationApi { /** * Add a successfully completed child span to the app startup trace */ - public fun addStartupChildSpan( + public fun addStartupTraceChildSpan( name: String, startTimeMs: Long, endTimeMs: Long, - ): Unit = addStartupChildSpan( + ): Unit = addStartupTraceChildSpan( name = name, startTimeMs = startTimeMs, endTimeMs = endTimeMs, @@ -85,7 +85,7 @@ public interface InstrumentationApi { * Add a completed child span to the app startup trace with the given attributes and span events. * Specify an [ErrorCode] if the span didn't complete successfully. */ - public fun addStartupChildSpan( + public fun addStartupTraceChildSpan( name: String, startTimeMs: Long, endTimeMs: Long, diff --git a/embrace-android-sdk/api/embrace-android-sdk.api b/embrace-android-sdk/api/embrace-android-sdk.api index 0f0cf1afac..7f4e914751 100644 --- a/embrace-android-sdk/api/embrace-android-sdk.api +++ b/embrace-android-sdk/api/embrace-android-sdk.api @@ -1,16 +1,16 @@ public final class io/embrace/android/embracesdk/Embrace : io/embrace/android/embracesdk/internal/api/SdkApi { public static final field Companion Lio/embrace/android/embracesdk/Embrace$Companion; public fun activityLoaded (Landroid/app/Activity;)V - public fun addAttributeToLoadTrace (Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V public fun addBreadcrumb (Ljava/lang/String;)V - public fun addChildSpanToLoadTrace (Landroid/app/Activity;Ljava/lang/String;JJ)V - public fun addChildSpanToLoadTrace (Landroid/app/Activity;Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V + public fun addLoadTraceAttribute (Landroid/app/Activity;Ljava/lang/String;Ljava/lang/String;)V + public fun addLoadTraceChildSpan (Landroid/app/Activity;Ljava/lang/String;JJ)V + public fun addLoadTraceChildSpan (Landroid/app/Activity;Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public fun addLogRecordExporter (Lio/opentelemetry/sdk/logs/export/LogRecordExporter;)V public fun addSessionProperty (Ljava/lang/String;Ljava/lang/String;Z)Z public fun addSpanExporter (Lio/opentelemetry/sdk/trace/export/SpanExporter;)V public fun addStartupChildSpan (Ljava/lang/String;JJ)V - public fun addStartupChildSpan (Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public fun addStartupTraceAttribute (Ljava/lang/String;Ljava/lang/String;)V + public fun addStartupTraceChildSpan (Ljava/lang/String;JJLjava/util/Map;Ljava/util/List;Lio/embrace/android/embracesdk/spans/ErrorCode;)V public fun addUserPersona (Ljava/lang/String;)V public fun clearAllUserPersonas ()V public fun clearUserEmail ()V diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/AppStartupTraceTest.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/AppStartupTraceTest.kt index 81d25cd5ea..634a07d665 100644 --- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/AppStartupTraceTest.kt +++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testcases/AppStartupTraceTest.kt @@ -33,7 +33,7 @@ internal class AppStartupTraceTest { testCaseAction = { val customStartTimeMs = clock.now() val customEndTimeMs = clock.tick(100L) - embrace.addStartupChildSpan("custom-span", customStartTimeMs, customEndTimeMs) + embrace.addStartupTraceChildSpan("custom-span", customStartTimeMs, customEndTimeMs) embrace.addStartupTraceAttribute("custom-attribute", "yes") simulateOpeningActivities( addStartupActivity = false, diff --git a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceActionInterface.kt b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceActionInterface.kt index f8adcb01f5..70076c0a2e 100644 --- a/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceActionInterface.kt +++ b/embrace-android-sdk/src/integrationTest/kotlin/io/embrace/android/embracesdk/testframework/actions/EmbraceActionInterface.kt @@ -102,11 +102,11 @@ internal class EmbraceActionInterface( setup.overriddenClock.tick(LIFECYCLE_EVENT_GAP) if (invokeManualEnd) { - embrace.addAttributeToLoadTrace(activityController.get(), "manual-end", "true") + embrace.addLoadTraceAttribute(activityController.get(), "manual-end", "true") val startTime = clock.now() setup.overriddenClock.tick(LIFECYCLE_EVENT_GAP) val endTime = clock.now() - embrace.addChildSpanToLoadTrace( + embrace.addLoadTraceChildSpan( activity = activityController.get(), name = "loading-time", startTimeMs = startTime, diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.kt index 11cbc25d62..d14a8adca7 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/Embrace.kt @@ -430,11 +430,11 @@ public class Embrace private constructor( override fun getSdkCurrentTimeMs(): Long = impl.getSdkCurrentTimeMs() - override fun addAttributeToLoadTrace(activity: Activity, key: String, value: String) { - impl.addAttributeToLoadTrace(activity, key, value) + override fun addLoadTraceAttribute(activity: Activity, key: String, value: String) { + impl.addLoadTraceAttribute(activity, key, value) } - override fun addChildSpanToLoadTrace( + override fun addLoadTraceChildSpan( activity: Activity, name: String, startTimeMs: Long, @@ -443,7 +443,7 @@ public class Embrace private constructor( events: List, errorCode: ErrorCode?, ) { - impl.addChildSpanToLoadTrace( + impl.addLoadTraceChildSpan( activity = activity, name = name, startTimeMs = startTimeMs, @@ -458,7 +458,7 @@ public class Embrace private constructor( impl.addStartupTraceAttribute(key, value) } - override fun addStartupChildSpan( + override fun addStartupTraceChildSpan( name: String, startTimeMs: Long, endTimeMs: Long, @@ -466,7 +466,7 @@ public class Embrace private constructor( events: List, errorCode: ErrorCode?, ) { - impl.addStartupChildSpan( + impl.addStartupTraceChildSpan( name = name, startTimeMs = startTimeMs, endTimeMs = endTimeMs, diff --git a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/api/delegate/InstrumentationApiDelegate.kt b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/api/delegate/InstrumentationApiDelegate.kt index 2fd73a731c..51246749d0 100644 --- a/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/api/delegate/InstrumentationApiDelegate.kt +++ b/embrace-android-sdk/src/main/java/io/embrace/android/embracesdk/internal/api/delegate/InstrumentationApiDelegate.kt @@ -30,13 +30,13 @@ internal class InstrumentationApiDelegate( override fun getSdkCurrentTimeMs(): Long = clock.now() - override fun addAttributeToLoadTrace(activity: Activity, key: String, value: String) { - if (sdkCallChecker.check("add_attribute_to_load_trace")) { + override fun addLoadTraceAttribute(activity: Activity, key: String, value: String) { + if (sdkCallChecker.check("add_load_trace_attribute")) { uiLoadTraceEmitter?.addAttribute(traceInstanceId(activity), key, value) } } - override fun addChildSpanToLoadTrace( + override fun addLoadTraceChildSpan( activity: Activity, name: String, startTimeMs: Long, @@ -45,7 +45,7 @@ internal class InstrumentationApiDelegate( events: List, errorCode: ErrorCode?, ) { - if (sdkCallChecker.check("add_child_span_to_load_trace")) { + if (sdkCallChecker.check("add_load_trace_child_span")) { uiLoadTraceEmitter?.addChildSpan( instanceId = traceInstanceId(activity), name = name, @@ -59,12 +59,12 @@ internal class InstrumentationApiDelegate( } override fun addStartupTraceAttribute(key: String, value: String) { - if (sdkCallChecker.check("add_attribute_to_app_startup_trace")) { + if (sdkCallChecker.check("add_startup_trace_attribute")) { appStartupDataCollector?.addAttribute(key, value) } } - override fun addStartupChildSpan( + override fun addStartupTraceChildSpan( name: String, startTimeMs: Long, endTimeMs: Long, @@ -72,7 +72,7 @@ internal class InstrumentationApiDelegate( events: List, errorCode: ErrorCode?, ) { - if (sdkCallChecker.check("add_child_span_to_app_startup_trace")) { + if (sdkCallChecker.check("add_startup_trace_child_span")) { appStartupDataCollector?.addTrackedInterval( name = name, startTimeMs = startTimeMs,