Skip to content

Commit 57ac666

Browse files
satweensatween
committed
RUM-13441: Moving HttpSpec, RequestInfo/ResponseInfo into internal module
1 parent eebab6b commit 57ac666

File tree

33 files changed

+122
-158
lines changed

33 files changed

+122
-158
lines changed

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

Lines changed: 0 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -147,21 +147,6 @@ interface com.datadog.android.api.feature.FeatureSdkCore : com.datadog.android.a
147147
interface com.datadog.android.api.feature.StorageBackedFeature : Feature
148148
val requestFactory: com.datadog.android.api.net.RequestFactory
149149
val storageConfiguration: com.datadog.android.api.storage.FeatureStorageConfiguration
150-
interface com.datadog.android.api.instrumentation.network.ExtendedRequestInfo
151-
fun <T> tag(Class<T>): T?
152-
fun <T> HttpRequestInfo.tag(Class<T>): T?
153-
interface com.datadog.android.api.instrumentation.network.HttpRequestInfo
154-
val url: String
155-
val headers: Map<String, List<String>>
156-
val contentType: String?
157-
val method: String
158-
fun contentLength(): Long?
159-
interface com.datadog.android.api.instrumentation.network.HttpResponseInfo
160-
val url: String
161-
val statusCode: Int
162-
val headers: Map<String, List<String>>
163-
val contentType: String?
164-
val contentLength: Long?
165150
data class com.datadog.android.api.net.Request
166151
constructor(String, String, String, Map<String, String>, ByteArray, String? = null)
167152
data class com.datadog.android.api.net.RequestExecutionContext
@@ -306,29 +291,6 @@ interface com.datadog.android.core.internal.net.FirstPartyHostHeaderTypeResolver
306291
fun headerTypesForUrl(okhttp3.HttpUrl): Set<com.datadog.android.trace.TracingHeaderType>
307292
fun getAllHeaderTypes(): Set<com.datadog.android.trace.TracingHeaderType>
308293
fun isEmpty(): Boolean
309-
object com.datadog.android.core.internal.net.HttpSpec
310-
object Method
311-
const val GET: String
312-
const val POST: String
313-
const val PATCH: String
314-
const val PUT: String
315-
const val HEAD: String
316-
const val DELETE: String
317-
const val TRACE: String
318-
const val OPTIONS: String
319-
const val CONNECT: String
320-
fun values()
321-
object Headers
322-
const val CONTENT_TYPE: String
323-
const val CONTENT_LENGTH: String
324-
const val WEBSOCKET_ACCEPT_HEADER: String
325-
object ContentType
326-
const val TEXT_PLAIN: String
327-
const val TEXT_EVENT_STREAM: String
328-
const val APPLICATION_GRPC: String
329-
const val APPLICATION_GRPC_PROTO: String
330-
const val APPLICATION_GRPC_JSON: String
331-
fun isStream(String?): Boolean
332294
interface com.datadog.android.core.internal.persistence.Deserializer<P: Any, R: Any>
333295
fun deserialize(P): R?
334296
fun java.io.File.canReadSafe(com.datadog.android.api.InternalLogger): Boolean

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

Lines changed: 0 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -443,30 +443,6 @@ public abstract interface class com/datadog/android/api/feature/StorageBackedFea
443443
public abstract fun getStorageConfiguration ()Lcom/datadog/android/api/storage/FeatureStorageConfiguration;
444444
}
445445

446-
public abstract interface class com/datadog/android/api/instrumentation/network/ExtendedRequestInfo {
447-
public abstract fun tag (Ljava/lang/Class;)Ljava/lang/Object;
448-
}
449-
450-
public final class com/datadog/android/api/instrumentation/network/ExtendedRequestInfoKt {
451-
public static final fun tag (Lcom/datadog/android/api/instrumentation/network/HttpRequestInfo;Ljava/lang/Class;)Ljava/lang/Object;
452-
}
453-
454-
public abstract interface class com/datadog/android/api/instrumentation/network/HttpRequestInfo {
455-
public abstract fun contentLength ()Ljava/lang/Long;
456-
public abstract fun getContentType ()Ljava/lang/String;
457-
public abstract fun getHeaders ()Ljava/util/Map;
458-
public abstract fun getMethod ()Ljava/lang/String;
459-
public abstract fun getUrl ()Ljava/lang/String;
460-
}
461-
462-
public abstract interface class com/datadog/android/api/instrumentation/network/HttpResponseInfo {
463-
public abstract fun getContentLength ()Ljava/lang/Long;
464-
public abstract fun getContentType ()Ljava/lang/String;
465-
public abstract fun getHeaders ()Ljava/util/Map;
466-
public abstract fun getStatusCode ()I
467-
public abstract fun getUrl ()Ljava/lang/String;
468-
}
469-
470446
public final class com/datadog/android/api/net/Request {
471447
public fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;[BLjava/lang/String;)V
472448
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/util/Map;[BLjava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
@@ -822,41 +798,6 @@ public abstract interface class com/datadog/android/core/internal/net/FirstParty
822798
public abstract fun isFirstPartyUrl (Lokhttp3/HttpUrl;)Z
823799
}
824800

825-
public final class com/datadog/android/core/internal/net/HttpSpec {
826-
public static final field INSTANCE Lcom/datadog/android/core/internal/net/HttpSpec;
827-
}
828-
829-
public final class com/datadog/android/core/internal/net/HttpSpec$ContentType {
830-
public static final field APPLICATION_GRPC Ljava/lang/String;
831-
public static final field APPLICATION_GRPC_JSON Ljava/lang/String;
832-
public static final field APPLICATION_GRPC_PROTO Ljava/lang/String;
833-
public static final field INSTANCE Lcom/datadog/android/core/internal/net/HttpSpec$ContentType;
834-
public static final field TEXT_EVENT_STREAM Ljava/lang/String;
835-
public static final field TEXT_PLAIN Ljava/lang/String;
836-
public final fun isStream (Ljava/lang/String;)Z
837-
}
838-
839-
public final class com/datadog/android/core/internal/net/HttpSpec$Headers {
840-
public static final field CONTENT_LENGTH Ljava/lang/String;
841-
public static final field CONTENT_TYPE Ljava/lang/String;
842-
public static final field INSTANCE Lcom/datadog/android/core/internal/net/HttpSpec$Headers;
843-
public static final field WEBSOCKET_ACCEPT_HEADER Ljava/lang/String;
844-
}
845-
846-
public final class com/datadog/android/core/internal/net/HttpSpec$Method {
847-
public static final field CONNECT Ljava/lang/String;
848-
public static final field DELETE Ljava/lang/String;
849-
public static final field GET Ljava/lang/String;
850-
public static final field HEAD Ljava/lang/String;
851-
public static final field INSTANCE Lcom/datadog/android/core/internal/net/HttpSpec$Method;
852-
public static final field OPTIONS Ljava/lang/String;
853-
public static final field PATCH Ljava/lang/String;
854-
public static final field POST Ljava/lang/String;
855-
public static final field PUT Ljava/lang/String;
856-
public static final field TRACE Ljava/lang/String;
857-
public final fun values ()Ljava/util/List;
858-
}
859-
860801
public abstract interface class com/datadog/android/core/internal/persistence/Deserializer {
861802
public abstract fun deserialize (Ljava/lang/Object;)Ljava/lang/Object;
862803
}

‎dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/tests/elmyr/ForgeExt.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,5 @@ fun <T : Forge> T.useCoreFactories(): T {
5151
addFactory(RawBatchEventForgeryFactory())
5252
addFactory(ThreadDumpForgeryFactory())
5353
addFactory(RequestExecutionContextForgeryFactory())
54-
addFactory(RequestInfoForgeryFactory())
55-
5654
return this
5755
}

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

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,50 @@ class com.datadog.android.internal.collections.EvictingQueue<T> : java.util.Queu
2424
override fun addAll(Collection<T>): Boolean
2525
data class com.datadog.android.internal.flags.RumFlagEvaluationMessage
2626
constructor(String, Any)
27+
interface com.datadog.android.internal.network.ExtendedRequestInfo
28+
fun <T> tag(Class<T>): T?
29+
fun <T> HttpRequestInfo.tag(Class<T>): T?
2730
enum com.datadog.android.internal.network.GraphQLHeaders
2831
constructor(String)
2932
- DD_GRAPHQL_NAME_HEADER
3033
- DD_GRAPHQL_VARIABLES_HEADER
3134
- DD_GRAPHQL_TYPE_HEADER
3235
- DD_GRAPHQL_PAYLOAD_HEADER
36+
interface com.datadog.android.internal.network.HttpRequestInfo
37+
val url: String
38+
val headers: Map<String, List<String>>
39+
val contentType: String?
40+
val method: String
41+
fun contentLength(): Long?
42+
interface com.datadog.android.internal.network.HttpResponseInfo
43+
val url: String
44+
val statusCode: Int
45+
val headers: Map<String, List<String>>
46+
val contentType: String?
47+
val contentLength: Long?
48+
object com.datadog.android.internal.network.HttpSpec
49+
object Method
50+
const val GET: String
51+
const val POST: String
52+
const val PATCH: String
53+
const val PUT: String
54+
const val HEAD: String
55+
const val DELETE: String
56+
const val TRACE: String
57+
const val OPTIONS: String
58+
const val CONNECT: String
59+
fun values()
60+
object Headers
61+
const val CONTENT_TYPE: String
62+
const val CONTENT_LENGTH: String
63+
const val WEBSOCKET_ACCEPT_HEADER: String
64+
object ContentType
65+
const val TEXT_PLAIN: String
66+
const val TEXT_EVENT_STREAM: String
67+
const val APPLICATION_GRPC: String
68+
const val APPLICATION_GRPC_PROTO: String
69+
const val APPLICATION_GRPC_JSON: String
70+
fun isStream(String?): Boolean
3371
interface com.datadog.android.internal.profiler.BenchmarkCounter
3472
fun add(Long, Map<String, String>)
3573
interface com.datadog.android.internal.profiler.BenchmarkMeter

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

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,14 @@ public final class com/datadog/android/internal/flags/RumFlagEvaluationMessage {
6767
public fun toString ()Ljava/lang/String;
6868
}
6969

70+
public abstract interface class com/datadog/android/internal/network/ExtendedRequestInfo {
71+
public abstract fun tag (Ljava/lang/Class;)Ljava/lang/Object;
72+
}
73+
74+
public final class com/datadog/android/internal/network/ExtendedRequestInfoKt {
75+
public static final fun tag (Lcom/datadog/android/internal/network/HttpRequestInfo;Ljava/lang/Class;)Ljava/lang/Object;
76+
}
77+
7078
public final class com/datadog/android/internal/network/GraphQLHeaders : java/lang/Enum {
7179
public static final field DD_GRAPHQL_NAME_HEADER Lcom/datadog/android/internal/network/GraphQLHeaders;
7280
public static final field DD_GRAPHQL_PAYLOAD_HEADER Lcom/datadog/android/internal/network/GraphQLHeaders;
@@ -77,6 +85,22 @@ public final class com/datadog/android/internal/network/GraphQLHeaders : java/la
7785
public static fun values ()[Lcom/datadog/android/internal/network/GraphQLHeaders;
7886
}
7987

88+
public abstract interface class com/datadog/android/internal/network/HttpRequestInfo {
89+
public abstract fun contentLength ()Ljava/lang/Long;
90+
public abstract fun getContentType ()Ljava/lang/String;
91+
public abstract fun getHeaders ()Ljava/util/Map;
92+
public abstract fun getMethod ()Ljava/lang/String;
93+
public abstract fun getUrl ()Ljava/lang/String;
94+
}
95+
96+
public abstract interface class com/datadog/android/internal/network/HttpResponseInfo {
97+
public abstract fun getContentLength ()Ljava/lang/Long;
98+
public abstract fun getContentType ()Ljava/lang/String;
99+
public abstract fun getHeaders ()Ljava/util/Map;
100+
public abstract fun getStatusCode ()I
101+
public abstract fun getUrl ()Ljava/lang/String;
102+
}
103+
80104
public abstract interface class com/datadog/android/internal/profiler/BenchmarkCounter {
81105
public abstract fun add (JLjava/util/Map;)V
82106
}

dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/instrumentation/network/ExtendedRequestInfo.kt renamed to dd-sdk-android-internal/src/main/java/com/datadog/android/internal/network/ExtendedRequestInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6-
package com.datadog.android.api.instrumentation.network
6+
package com.datadog.android.internal.network
77

88
/**
99
* This interface indicates that the request supports non HTTP-specified methods.

dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/instrumentation/network/HttpRequestInfo.kt renamed to dd-sdk-android-internal/src/main/java/com/datadog/android/internal/network/HttpRequestInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6-
package com.datadog.android.api.instrumentation.network
6+
package com.datadog.android.internal.network
77

88
/**
99
* Represents information about an HTTP request.

dd-sdk-android-core/src/main/kotlin/com/datadog/android/api/instrumentation/network/HttpResponseInfo.kt renamed to dd-sdk-android-internal/src/main/java/com/datadog/android/internal/network/HttpResponseInfo.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* This product includes software developed at Datadog (https://www.datadoghq.com/).
44
* Copyright 2016-Present Datadog, Inc.
55
*/
6-
package com.datadog.android.api.instrumentation.network
6+
package com.datadog.android.internal.network
77

88
/**
99
* Represents information about an HTTP response.

dd-sdk-android-core/src/main/kotlin/com/datadog/android/core/internal/net/HttpSpec.kt renamed to dd-sdk-android-internal/src/main/java/com/datadog/android/internal/network/HttpSpec.kt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,13 @@
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.net
76

8-
import com.datadog.android.lint.InternalApi
7+
package com.datadog.android.internal.network
98

109
/**
1110
* HTTP specification constants and utilities.
1211
*/
13-
@InternalApi
1412
object HttpSpec {
15-
1613
/**
1714
* Standard HTTP request methods.
1815
*/

dd-sdk-android-core/src/testFixtures/kotlin/com/datadog/android/api/instrumentation/network/RequestInfoAssert.kt renamed to dd-sdk-android-internal/src/testFixtures/kotlin/com/datadog/android/internal/network/RequestInfoAssert.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* Copyright 2016-Present Datadog, Inc.
55
*/
66

7-
package com.datadog.android.api.instrumentation.network
7+
package com.datadog.android.internal.network
88

99
import org.assertj.core.api.AbstractObjectAssert
1010
import org.assertj.core.api.Assertions.assertThat

0 commit comments

Comments
 (0)