Skip to content

Commit 60a1945

Browse files
0xnm0xnm
authored
Merge pull request #2705 from DataDog/nogorodnikov/move-local-attributes-and-extension-method-to-internal-module
Move `LocalAttribute` class and related extension methods to the `internal` module
2 parents ffc7e94 + 8cda755 commit 60a1945

File tree

22 files changed

+77
-87
lines changed

22 files changed

+77
-87
lines changed

‎dd-sdk-android-core/api/apiSurface

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -260,24 +260,6 @@ sealed class com.datadog.android.core.feature.event.JvmCrash
260260
constructor(Throwable, String, List<ThreadDump>)
261261
data class com.datadog.android.core.feature.event.ThreadDump
262262
constructor(String, String, String, Boolean)
263-
interface com.datadog.android.core.internal.attributes.LocalAttribute
264-
enum Key
265-
constructor(String)
266-
- CREATION_SAMPLING_RATE
267-
- REPORTING_SAMPLING_RATE
268-
- VIEW_SCOPE_INSTRUMENTATION_TYPE
269-
override fun toString(): String
270-
interface Constant
271-
val key: Key
272-
fun MutableMap<String, Any?>.enrichWithConstantAttribute(LocalAttribute.Constant)
273-
fun MutableMap<String, Any?>.enrichWithNonNullAttribute(LocalAttribute.Key, Any?)
274-
fun MutableMap<String, Any?>.enrichWithLocalAttribute(LocalAttribute.Key, Any?)
275-
enum com.datadog.android.core.internal.attributes.ViewScopeInstrumentationType : LocalAttribute.Constant
276-
- MANUAL
277-
- COMPOSE
278-
- ACTIVITY
279-
- FRAGMENT
280-
override val key: LocalAttribute.Key
281263
class com.datadog.android.core.internal.net.DefaultFirstPartyHostHeaderTypeResolver : FirstPartyHostHeaderTypeResolver
282264
constructor(Map<String, Set<com.datadog.android.trace.TracingHeaderType>>)
283265
override fun isFirstPartyUrl(okhttp3.HttpUrl): Boolean

‎dd-sdk-android-core/api/dd-sdk-android-core.api

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -733,38 +733,6 @@ public final class com/datadog/android/core/feature/event/ThreadDump {
733733
public fun toString ()Ljava/lang/String;
734734
}
735735

736-
public abstract interface class com/datadog/android/core/internal/attributes/LocalAttribute {
737-
}
738-
739-
public abstract interface class com/datadog/android/core/internal/attributes/LocalAttribute$Constant {
740-
public abstract fun getKey ()Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
741-
}
742-
743-
public final class com/datadog/android/core/internal/attributes/LocalAttribute$Key : java/lang/Enum {
744-
public static final field CREATION_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
745-
public static final field REPORTING_SAMPLING_RATE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
746-
public static final field VIEW_SCOPE_INSTRUMENTATION_TYPE Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
747-
public fun toString ()Ljava/lang/String;
748-
public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
749-
public static fun values ()[Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
750-
}
751-
752-
public final class com/datadog/android/core/internal/attributes/LocalAttributeKt {
753-
public static final fun enrichWithConstantAttribute (Ljava/util/Map;Lcom/datadog/android/core/internal/attributes/LocalAttribute$Constant;)Ljava/util/Map;
754-
public static final fun enrichWithLocalAttribute (Ljava/util/Map;Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;Ljava/lang/Object;)Ljava/util/Map;
755-
public static final fun enrichWithNonNullAttribute (Ljava/util/Map;Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;Ljava/lang/Object;)Ljava/util/Map;
756-
}
757-
758-
public final class com/datadog/android/core/internal/attributes/ViewScopeInstrumentationType : java/lang/Enum, com/datadog/android/core/internal/attributes/LocalAttribute$Constant {
759-
public static final field ACTIVITY Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
760-
public static final field COMPOSE Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
761-
public static final field FRAGMENT Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
762-
public static final field MANUAL Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
763-
public fun getKey ()Lcom/datadog/android/core/internal/attributes/LocalAttribute$Key;
764-
public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
765-
public static fun values ()[Lcom/datadog/android/core/internal/attributes/ViewScopeInstrumentationType;
766-
}
767-
768736
public final class com/datadog/android/core/internal/net/DefaultFirstPartyHostHeaderTypeResolver : com/datadog/android/core/internal/net/FirstPartyHostHeaderTypeResolver {
769737
public fun <init> (Ljava/util/Map;)V
770738
public fun getAllHeaderTypes ()Ljava/util/Set;

‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/logger/SdkInternalLogger.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import com.datadog.android.Datadog
1212
import com.datadog.android.api.InternalLogger
1313
import com.datadog.android.api.feature.Feature
1414
import com.datadog.android.api.feature.FeatureSdkCore
15-
import com.datadog.android.core.internal.attributes.LocalAttribute
16-
import com.datadog.android.core.internal.attributes.enrichWithNonNullAttribute
1715
import com.datadog.android.core.internal.metrics.MethodCalledTelemetry
1816
import com.datadog.android.core.metrics.PerformanceMetric
1917
import com.datadog.android.core.metrics.TelemetryMetricType
2018
import com.datadog.android.core.sampling.RateBasedSampler
19+
import com.datadog.android.internal.attributes.LocalAttribute
20+
import com.datadog.android.internal.attributes.enrichWithNonNullAttribute
2121
import com.datadog.android.internal.telemetry.InternalTelemetryEvent
2222

2323
internal class SdkInternalLogger(

‎dd-sdk-android-core/src/test/kotlin/com/datadog/android/core/internal/logger/SdkInternalLoggerTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ import com.datadog.android.api.InternalLogger
1212
import com.datadog.android.api.feature.Feature
1313
import com.datadog.android.api.feature.FeatureScope
1414
import com.datadog.android.api.feature.FeatureSdkCore
15-
import com.datadog.android.core.internal.attributes.LocalAttribute
1615
import com.datadog.android.core.internal.metrics.MethodCalledTelemetry
1716
import com.datadog.android.core.metrics.TelemetryMetricType
17+
import com.datadog.android.internal.attributes.LocalAttribute
1818
import com.datadog.android.internal.telemetry.InternalTelemetryEvent
1919
import com.datadog.android.utils.forge.Configurator
2020
import com.datadog.tools.unit.forge.aThrowable

‎dd-sdk-android-internal/api/apiSurface

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,21 @@
1+
interface com.datadog.android.internal.attributes.LocalAttribute
2+
enum Key
3+
constructor(String)
4+
- CREATION_SAMPLING_RATE
5+
- REPORTING_SAMPLING_RATE
6+
- VIEW_SCOPE_INSTRUMENTATION_TYPE
7+
override fun toString(): String
8+
interface Constant
9+
val key: Key
10+
fun MutableMap<String, Any?>.enrichWithConstantAttribute(LocalAttribute.Constant)
11+
fun MutableMap<String, Any?>.enrichWithNonNullAttribute(LocalAttribute.Key, Any?)
12+
fun MutableMap<String, Any?>.enrichWithLocalAttribute(LocalAttribute.Key, Any?)
13+
enum com.datadog.android.internal.attributes.ViewScopeInstrumentationType : LocalAttribute.Constant
14+
- MANUAL
15+
- COMPOSE
16+
- ACTIVITY
17+
- FRAGMENT
18+
override val key: LocalAttribute.Key
119
class com.datadog.android.internal.collections.EvictingQueue<T> : java.util.Queue<T>
220
constructor(Int = Int.MAX_VALUE)
321
override val size: Int

‎dd-sdk-android-internal/api/dd-sdk-android-internal.api

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,35 @@
1+
public abstract interface class com/datadog/android/internal/attributes/LocalAttribute {
2+
}
3+
4+
public abstract interface class com/datadog/android/internal/attributes/LocalAttribute$Constant {
5+
public abstract fun getKey ()Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
6+
}
7+
8+
public final class com/datadog/android/internal/attributes/LocalAttribute$Key : java/lang/Enum {
9+
public static final field CREATION_SAMPLING_RATE Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
10+
public static final field REPORTING_SAMPLING_RATE Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
11+
public static final field VIEW_SCOPE_INSTRUMENTATION_TYPE Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
12+
public fun toString ()Ljava/lang/String;
13+
public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
14+
public static fun values ()[Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
15+
}
16+
17+
public final class com/datadog/android/internal/attributes/LocalAttributeKt {
18+
public static final fun enrichWithConstantAttribute (Ljava/util/Map;Lcom/datadog/android/internal/attributes/LocalAttribute$Constant;)Ljava/util/Map;
19+
public static final fun enrichWithLocalAttribute (Ljava/util/Map;Lcom/datadog/android/internal/attributes/LocalAttribute$Key;Ljava/lang/Object;)Ljava/util/Map;
20+
public static final fun enrichWithNonNullAttribute (Ljava/util/Map;Lcom/datadog/android/internal/attributes/LocalAttribute$Key;Ljava/lang/Object;)Ljava/util/Map;
21+
}
22+
23+
public final class com/datadog/android/internal/attributes/ViewScopeInstrumentationType : java/lang/Enum, com/datadog/android/internal/attributes/LocalAttribute$Constant {
24+
public static final field ACTIVITY Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
25+
public static final field COMPOSE Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
26+
public static final field FRAGMENT Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
27+
public static final field MANUAL Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
28+
public fun getKey ()Lcom/datadog/android/internal/attributes/LocalAttribute$Key;
29+
public static fun valueOf (Ljava/lang/String;)Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
30+
public static fun values ()[Lcom/datadog/android/internal/attributes/ViewScopeInstrumentationType;
31+
}
32+
133
public final class com/datadog/android/internal/collections/EvictingQueue : java/util/Queue {
234
public fun <init> (I)V
335
public synthetic fun <init> (IILkotlin/jvm/internal/DefaultConstructorMarker;)V

‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/LocalAttribute.kt renamed to ‎dd-sdk-android-internal/src/main/java/com/datadog/android/internal/attributes/LocalAttribute.kt

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,12 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6-
package com.datadog.android.core.internal.attributes
7-
8-
import com.datadog.android.lint.InternalApi
6+
package com.datadog.android.internal.attributes
97

108
/**
119
* Local attributes are used to pass additional metadata along with the event
1210
* and are never sent to the backend directly.
1311
*/
14-
@InternalApi
1512
interface LocalAttribute {
1613

1714
/**
@@ -20,7 +17,6 @@ interface LocalAttribute {
2017
*
2118
* @param string - Unique string value for a local attribute key.
2219
*/
23-
@InternalApi
2420
enum class Key(
2521
private val string: String
2622
) {
@@ -57,7 +53,6 @@ interface LocalAttribute {
5753
* an attribute and reduces the possibility of inconsistent use of api (when an unsupported value is passed
5854
* for a particular attribute key).
5955
*/
60-
@InternalApi
6156
interface Constant {
6257
/** Constant attribute key. For enum constants will be same for all values. */
6358
val key: Key
@@ -70,7 +65,6 @@ interface LocalAttribute {
7065
* @param attribute - Constant attribute value that should be added.
7166
* Key for the attribute will be resolved automatically.
7267
*/
73-
@InternalApi
7468
fun MutableMap<String, Any?>.enrichWithConstantAttribute(
7569
attribute: LocalAttribute.Constant
7670
) = enrichWithLocalAttribute(
@@ -84,7 +78,6 @@ fun MutableMap<String, Any?>.enrichWithConstantAttribute(
8478
* @param key - local attribute key.
8579
* @param value - attribute value.
8680
*/
87-
@InternalApi
8881
fun MutableMap<String, Any?>.enrichWithNonNullAttribute(
8982
key: LocalAttribute.Key,
9083
value: Any?
@@ -96,7 +89,6 @@ fun MutableMap<String, Any?>.enrichWithNonNullAttribute(
9689
* @param key - local attribute key.
9790
* @param value - attribute value.
9891
*/
99-
@InternalApi
10092
fun MutableMap<String, Any?>.enrichWithLocalAttribute(
10193
key: LocalAttribute.Key,
10294
value: Any?

‎dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/attributes/ViewScopeInstrumentationType.kt renamed to ‎dd-sdk-android-internal/src/main/java/com/datadog/android/internal/attributes/ViewScopeInstrumentationType.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,11 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6-
package com.datadog.android.core.internal.attributes
7-
8-
import com.datadog.android.lint.InternalApi
6+
package com.datadog.android.internal.attributes
97

108
/**
119
* A set of constants describing the instrumentation that were used to define the view scope.
1210
*/
13-
@InternalApi
1411
enum class ViewScopeInstrumentationType : LocalAttribute.Constant {
1512
/** Tracked manually through the RUMMonitor API. */
1613
MANUAL,

‎features/dd-sdk-android-rum/src/main/kotlin/com/datadog/android/rum/internal/domain/scope/RumViewScope.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ import com.datadog.android.api.feature.Feature
1313
import com.datadog.android.api.storage.DataWriter
1414
import com.datadog.android.api.storage.EventType
1515
import com.datadog.android.core.InternalSdkCore
16-
import com.datadog.android.core.internal.attributes.LocalAttribute
17-
import com.datadog.android.core.internal.attributes.ViewScopeInstrumentationType
1816
import com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
17+
import com.datadog.android.internal.attributes.LocalAttribute
18+
import com.datadog.android.internal.attributes.ViewScopeInstrumentationType
1919
import com.datadog.android.internal.telemetry.InternalTelemetryEvent
2020
import com.datadog.android.internal.utils.loggableStackTrace
2121
import com.datadog.android.rum.GlobalRumMonitor

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ package com.datadog.android.rum.internal.metric
88
import androidx.annotation.VisibleForTesting
99
import com.datadog.android.api.InternalLogger
1010
import com.datadog.android.api.InternalLogger.Target
11-
import com.datadog.android.core.internal.attributes.ViewScopeInstrumentationType
11+
import com.datadog.android.internal.attributes.ViewScopeInstrumentationType
1212
import com.datadog.android.rum.internal.domain.scope.RumViewType
1313

1414
internal class ViewEndedMetricDispatcher(

0 commit comments

Comments
 (0)