Skip to content

Commit

Permalink
Move public APIs in external packages
Browse files Browse the repository at this point in the history
  • Loading branch information
mariusc83 committed Dec 2, 2024
1 parent a151145 commit 85893e3
Show file tree
Hide file tree
Showing 21 changed files with 64 additions and 59 deletions.
22 changes: 11 additions & 11 deletions features/dd-sdk-android-rum/api/apiSurface
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ data class com.datadog.android.rum.RumConfiguration
fun setVitalsUpdateFrequency(com.datadog.android.rum.configuration.VitalsUpdateFrequency): Builder
fun useCustomEndpoint(String): Builder
fun setSessionListener(RumSessionListener): Builder
fun setNetworkSettledInitialResourceIdentifier(com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier): Builder
fun setNetworkSettledInitialResourceIdentifier(com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier): Builder
fun build(): RumConfiguration
enum com.datadog.android.rum.RumErrorSource
- NETWORK
Expand Down Expand Up @@ -167,16 +167,6 @@ interface com.datadog.android.rum.event.ViewEventMapper : com.datadog.android.ev
override fun map(com.datadog.android.rum.model.ViewEvent): com.datadog.android.rum.model.ViewEvent
data class com.datadog.android.rum.internal.domain.event.ResourceTiming
constructor(Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L, Long = 0L)
interface com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
fun validate(NetworkSettledResourceContext): Boolean
data class com.datadog.android.rum.internal.metric.networksettled.NetworkSettledResourceContext
constructor(String, Long, Long?)
class com.datadog.android.rum.internal.metric.networksettled.TimeBasedInitialResourceIdentifier : InitialResourceIdentifier
constructor(Long = DEFAULT_TIME_THRESHOLD_MS)
override fun validate(NetworkSettledResourceContext): Boolean
override fun equals(Any?): Boolean
override fun hashCode(): Int
companion object
interface com.datadog.android.rum.internal.monitor.AdvancedNetworkRumMonitor : com.datadog.android.rum.RumMonitor
fun waitForResourceTiming(Any)
fun addResourceTiming(Any, com.datadog.android.rum.internal.domain.event.ResourceTiming)
Expand All @@ -185,6 +175,16 @@ interface com.datadog.android.rum.internal.monitor.AdvancedNetworkRumMonitor : c
fun stopResource(com.datadog.android.rum.resource.ResourceId, Int?, Long?, com.datadog.android.rum.RumResourceKind, Map<String, Any?>)
fun stopResourceWithError(com.datadog.android.rum.resource.ResourceId, Int?, String, com.datadog.android.rum.RumErrorSource, Throwable, Map<String, Any?> = emptyMap())
fun stopResourceWithError(com.datadog.android.rum.resource.ResourceId, Int?, String, com.datadog.android.rum.RumErrorSource, String, String?, Map<String, Any?> = emptyMap())
interface com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
fun validate(NetworkSettledResourceContext): Boolean
data class com.datadog.android.rum.metric.networksettled.NetworkSettledResourceContext
constructor(String, Long, Long?)
class com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier : InitialResourceIdentifier
constructor(Long = DEFAULT_TIME_THRESHOLD_MS)
override fun validate(NetworkSettledResourceContext): Boolean
override fun equals(Any?): Boolean
override fun hashCode(): Int
companion object
fun android.content.Context.getAssetAsRumResource(String, Int = AssetManager.ACCESS_STREAMING, com.datadog.android.api.SdkCore = Datadog.getInstance()): java.io.InputStream
fun android.content.Context.getRawResAsRumResource(Int, com.datadog.android.api.SdkCore = Datadog.getInstance()): java.io.InputStream
fun java.io.InputStream.asRumResource(String, com.datadog.android.api.SdkCore = Datadog.getInstance()): java.io.InputStream
Expand Down
52 changes: 26 additions & 26 deletions features/dd-sdk-android-rum/api/dd-sdk-android-rum.api
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ public final class com/datadog/android/rum/RumConfiguration$Builder {
public final fun setActionEventMapper (Lcom/datadog/android/event/EventMapper;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setErrorEventMapper (Lcom/datadog/android/event/EventMapper;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setLongTaskEventMapper (Lcom/datadog/android/event/EventMapper;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setNetworkSettledInitialResourceIdentifier (Lcom/datadog/android/rum/internal/metric/networksettled/InitialResourceIdentifier;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setNetworkSettledInitialResourceIdentifier (Lcom/datadog/android/rum/metric/networksettled/InitialResourceIdentifier;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setResourceEventMapper (Lcom/datadog/android/event/EventMapper;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setSessionListener (Lcom/datadog/android/rum/RumSessionListener;)Lcom/datadog/android/rum/RumConfiguration$Builder;
public final fun setSessionSampleRate (F)Lcom/datadog/android/rum/RumConfiguration$Builder;
Expand Down Expand Up @@ -288,46 +288,46 @@ public abstract class com/datadog/android/rum/internal/instrumentation/gestures/
public fun onScroll (Landroid/view/MotionEvent;Landroid/view/MotionEvent;FF)Z
}

public abstract interface class com/datadog/android/rum/internal/metric/networksettled/InitialResourceIdentifier {
public abstract fun validate (Lcom/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext;)Z
public abstract interface class com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor : com/datadog/android/rum/RumMonitor {
public abstract fun addResourceTiming (Ljava/lang/Object;Lcom/datadog/android/rum/internal/domain/event/ResourceTiming;)V
public abstract fun notifyInterceptorInstantiated ()V
public abstract fun startResource (Lcom/datadog/android/rum/resource/ResourceId;Lcom/datadog/android/rum/RumResourceMethod;Ljava/lang/String;Ljava/util/Map;)V
public abstract fun stopResource (Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/Long;Lcom/datadog/android/rum/RumResourceKind;Ljava/util/Map;)V
public abstract fun stopResourceWithError (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;)V
public abstract fun stopResourceWithError (Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/Throwable;Ljava/util/Map;)V
public abstract fun waitForResourceTiming (Ljava/lang/Object;)V
}

public final class com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor$DefaultImpls {
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
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
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
}

public abstract interface class com/datadog/android/rum/metric/networksettled/InitialResourceIdentifier {
public abstract fun validate (Lcom/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext;)Z
}

public final class com/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext {
public final class com/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext {
public fun <init> (Ljava/lang/String;JLjava/lang/Long;)V
public final fun copy (Ljava/lang/String;JLjava/lang/Long;)Lcom/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext;
public static synthetic fun copy$default (Lcom/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext;Ljava/lang/String;JLjava/lang/Long;ILjava/lang/Object;)Lcom/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext;
public final fun copy (Ljava/lang/String;JLjava/lang/Long;)Lcom/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext;
public static synthetic fun copy$default (Lcom/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext;Ljava/lang/String;JLjava/lang/Long;ILjava/lang/Object;)Lcom/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext;
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
public fun toString ()Ljava/lang/String;
}

public final class com/datadog/android/rum/internal/metric/networksettled/TimeBasedInitialResourceIdentifier : com/datadog/android/rum/internal/metric/networksettled/InitialResourceIdentifier {
public static final field Companion Lcom/datadog/android/rum/internal/metric/networksettled/TimeBasedInitialResourceIdentifier$Companion;
public final class com/datadog/android/rum/metric/networksettled/TimeBasedInitialResourceIdentifier : com/datadog/android/rum/metric/networksettled/InitialResourceIdentifier {
public static final field Companion Lcom/datadog/android/rum/metric/networksettled/TimeBasedInitialResourceIdentifier$Companion;
public fun <init> ()V
public fun <init> (J)V
public synthetic fun <init> (JILkotlin/jvm/internal/DefaultConstructorMarker;)V
public fun equals (Ljava/lang/Object;)Z
public fun hashCode ()I
public fun validate (Lcom/datadog/android/rum/internal/metric/networksettled/NetworkSettledResourceContext;)Z
public fun validate (Lcom/datadog/android/rum/metric/networksettled/NetworkSettledResourceContext;)Z
}

public final class com/datadog/android/rum/internal/metric/networksettled/TimeBasedInitialResourceIdentifier$Companion {
}

public abstract interface class com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor : com/datadog/android/rum/RumMonitor {
public abstract fun addResourceTiming (Ljava/lang/Object;Lcom/datadog/android/rum/internal/domain/event/ResourceTiming;)V
public abstract fun notifyInterceptorInstantiated ()V
public abstract fun startResource (Lcom/datadog/android/rum/resource/ResourceId;Lcom/datadog/android/rum/RumResourceMethod;Ljava/lang/String;Ljava/util/Map;)V
public abstract fun stopResource (Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/Long;Lcom/datadog/android/rum/RumResourceKind;Ljava/util/Map;)V
public abstract fun stopResourceWithError (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;)V
public abstract fun stopResourceWithError (Lcom/datadog/android/rum/resource/ResourceId;Ljava/lang/Integer;Ljava/lang/String;Lcom/datadog/android/rum/RumErrorSource;Ljava/lang/Throwable;Ljava/util/Map;)V
public abstract fun waitForResourceTiming (Ljava/lang/Object;)V
}

public final class com/datadog/android/rum/internal/monitor/AdvancedNetworkRumMonitor$DefaultImpls {
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
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
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
public final class com/datadog/android/rum/metric/networksettled/TimeBasedInitialResourceIdentifier$Companion {
}

public final class com/datadog/android/rum/model/ActionEvent {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ import com.datadog.android.rum.configuration.VitalsUpdateFrequency
import com.datadog.android.rum.event.ViewEventMapper
import com.datadog.android.rum.internal.RumFeature
import com.datadog.android.rum.internal.instrumentation.MainLooperLongTaskStrategy
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.metric.networksettled.TimeBasedInitialResourceIdentifier
import com.datadog.android.rum.internal.tracking.NoOpInteractionPredicate
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
import com.datadog.android.rum.model.ActionEvent
import com.datadog.android.rum.model.ErrorEvent
import com.datadog.android.rum.model.LongTaskEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,6 @@ import com.datadog.android.rum.internal.instrumentation.MainLooperLongTaskStrate
import com.datadog.android.rum.internal.instrumentation.UserActionTrackingStrategyApi29
import com.datadog.android.rum.internal.instrumentation.UserActionTrackingStrategyLegacy
import com.datadog.android.rum.internal.instrumentation.gestures.DatadogGesturesTracker
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.metric.networksettled.NoOpInitialResourceIdentifier
import com.datadog.android.rum.internal.metric.networksettled.TimeBasedInitialResourceIdentifier
import com.datadog.android.rum.internal.monitor.AdvancedRumMonitor
import com.datadog.android.rum.internal.monitor.DatadogRumMonitor
import com.datadog.android.rum.internal.net.RumRequestFactory
Expand All @@ -70,6 +67,9 @@ import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.internal.vitals.VitalObserver
import com.datadog.android.rum.internal.vitals.VitalReader
import com.datadog.android.rum.internal.vitals.VitalReaderRunnable
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.metric.networksettled.NoOpInitialResourceIdentifier
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier
import com.datadog.android.rum.model.ActionEvent
import com.datadog.android.rum.model.ErrorEvent
import com.datadog.android.rum.model.LongTaskEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ import com.datadog.android.rum.RumSessionListener
import com.datadog.android.rum.internal.domain.RumContext
import com.datadog.android.rum.internal.domain.Time
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import java.util.concurrent.TimeUnit

@Suppress("LongParameterList")
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
import com.datadog.android.rum.RumSessionListener
import com.datadog.android.rum.internal.domain.RumContext
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.utils.percent
import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import java.security.SecureRandom
import java.util.UUID
import java.util.concurrent.TimeUnit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ import com.datadog.android.rum.internal.domain.Time
import com.datadog.android.rum.internal.metric.SessionEndedMetric
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
import com.datadog.android.rum.internal.metric.interactiontonextview.InteractionToNextViewMetricResolver
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.metric.networksettled.NetworkSettledMetricResolver
import com.datadog.android.rum.internal.vitals.NoOpVitalMonitor
import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import java.util.Locale
import java.util.concurrent.TimeUnit

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,14 @@ import com.datadog.android.rum.internal.domain.Time
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
import com.datadog.android.rum.internal.metric.interactiontonextview.InteractionToNextViewMetricResolver
import com.datadog.android.rum.internal.metric.interactiontonextview.InternalInteractionContext
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.metric.networksettled.NetworkSettledMetricResolver
import com.datadog.android.rum.internal.monitor.StorageEvent
import com.datadog.android.rum.internal.utils.hasUserData
import com.datadog.android.rum.internal.utils.newRumEventWriteOperation
import com.datadog.android.rum.internal.vitals.VitalInfo
import com.datadog.android.rum.internal.vitals.VitalListener
import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.model.ActionEvent
import com.datadog.android.rum.model.ErrorEvent
import com.datadog.android.rum.model.LongTaskEvent
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
package com.datadog.android.rum.internal.metric.networksettled

import com.datadog.android.api.InternalLogger
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.metric.networksettled.NetworkSettledResourceContext
import com.datadog.android.rum.metric.networksettled.TimeBasedInitialResourceIdentifier

internal class NetworkSettledMetricResolver(
private val initialResourceIdentifier: InitialResourceIdentifier = TimeBasedInitialResourceIdentifier(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ import com.datadog.android.rum.internal.domain.scope.RumSessionScope
import com.datadog.android.rum.internal.domain.scope.RumViewManagerScope
import com.datadog.android.rum.internal.domain.scope.RumViewScope
import com.datadog.android.rum.internal.metric.SessionMetricDispatcher
import com.datadog.android.rum.internal.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.internal.vitals.VitalMonitor
import com.datadog.android.rum.metric.networksettled.InitialResourceIdentifier
import com.datadog.android.rum.resource.ResourceId
import com.datadog.android.telemetry.internal.TelemetryEventHandler
import java.util.Locale
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.rum.internal.metric.networksettled
package com.datadog.android.rum.metric.networksettled

import com.datadog.tools.annotation.NoOpImplementation

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.rum.internal.metric.networksettled
package com.datadog.android.rum.metric.networksettled

/**
* Represents the context of a network resource that has settled.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* Copyright 2016-Present Datadog, Inc.
*/

package com.datadog.android.rum.internal.metric.networksettled
package com.datadog.android.rum.metric.networksettled

import java.util.concurrent.TimeUnit

Expand Down
Loading

0 comments on commit 85893e3

Please sign in to comment.