Skip to content

Commit 4e890c1

Browse files
0xnm0xnm
authored
Merge pull request #2837 from DataDog/nogorodnikov/revert-ddtags-changes
Revert "RUM-11137: Move session properties to ddtags over query parameters" for the 2.26.0 release
2 parents 44d37ef + b0ff736 commit 4e890c1

37 files changed

+1887
-272
lines changed

‎features/dd-sdk-android-rum/build.gradle.kts‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@ android {
5050
}
5151

5252
namespace = "com.datadog.android.rum"
53-
54-
testFixtures {
55-
enable = true
56-
}
5753
}
5854

5955
dependencies {
@@ -89,22 +85,6 @@ dependencies {
8985
testImplementation(libs.okHttpMock)
9086
testImplementation(libs.bundles.openTracing)
9187
unmock(libs.robolectric)
92-
93-
// Test Fixtures
94-
testFixturesImplementation(testFixtures(project(":dd-sdk-android-core")))
95-
testFixturesImplementation(testFixtures(project(":dd-sdk-android-internal")))
96-
testFixturesImplementation(project(":tools:unit")) {
97-
attributes {
98-
attribute(
99-
com.android.build.api.attributes.ProductFlavorAttr.of("platform"),
100-
objects.named("jvm")
101-
)
102-
}
103-
}
104-
testFixturesImplementation(libs.kotlin)
105-
testFixturesImplementation(libs.bundles.jUnit5)
106-
testFixturesImplementation(libs.okHttp)
107-
testFixturesImplementation(libs.bundles.testTools)
10888
}
10989

11090
unMock {

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import com.datadog.android.rum.internal.domain.RumContext
2525
import com.datadog.android.rum.internal.domain.event.RumEventDeserializer
2626
import com.datadog.android.rum.internal.domain.scope.toErrorSchemaType
2727
import com.datadog.android.rum.internal.domain.scope.tryFromSource
28-
import com.datadog.android.rum.internal.utils.buildDDTagsString
2928
import com.datadog.android.rum.model.ErrorEvent
3029
import com.datadog.android.rum.model.ViewEvent
3130
import com.google.gson.JsonObject
@@ -267,8 +266,7 @@ internal class DatadogLateCrashReporter(
267266
},
268267
timeSinceAppStart = timeSinceAppStartMs
269268
),
270-
version = viewEvent.version,
271-
ddtags = buildDDTagsString(datadogContext)
269+
version = viewEvent.version
272270
)
273271
}
274272

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import com.datadog.android.rum.internal.domain.RumContext
1717
import com.datadog.android.rum.internal.domain.Time
1818
import com.datadog.android.rum.internal.monitor.StorageEvent
1919
import com.datadog.android.rum.internal.toAction
20-
import com.datadog.android.rum.internal.utils.buildDDTagsString
2120
import com.datadog.android.rum.internal.utils.hasUserData
2221
import com.datadog.android.rum.internal.utils.newRumEventWriteOperation
2322
import com.datadog.android.rum.model.ActionEvent
@@ -330,8 +329,7 @@ internal class RumActionScope(
330329
),
331330
connectivity = networkInfo.toActionConnectivity(),
332331
service = datadogContext.service,
333-
version = datadogContext.version,
334-
ddtags = buildDDTagsString(datadogContext)
332+
version = datadogContext.version
335333
)
336334
}
337335
.apply {

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import com.datadog.android.rum.internal.metric.networksettled.NetworkSettledMetr
2727
import com.datadog.android.rum.internal.monitor.StorageEvent
2828
import com.datadog.android.rum.internal.toError
2929
import com.datadog.android.rum.internal.toResource
30-
import com.datadog.android.rum.internal.utils.buildDDTagsString
3130
import com.datadog.android.rum.internal.utils.hasUserData
3231
import com.datadog.android.rum.internal.utils.newRumEventWriteOperation
3332
import com.datadog.android.rum.model.ErrorEvent
@@ -310,8 +309,7 @@ internal class RumResourceScope(
310309
configuration = ResourceEvent.Configuration(sessionSampleRate = sampleRate)
311310
),
312311
service = datadogContext.service,
313-
version = datadogContext.version,
314-
ddtags = buildDDTagsString(datadogContext)
312+
version = datadogContext.version
315313
)
316314
}
317315
.onError {
@@ -466,8 +464,7 @@ internal class RumResourceScope(
466464
configuration = ErrorEvent.Configuration(sessionSampleRate = sampleRate)
467465
),
468466
service = datadogContext.service,
469-
version = datadogContext.version,
470-
ddtags = buildDDTagsString(datadogContext)
467+
version = datadogContext.version
471468
)
472469
}
473470
.onError {

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

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import com.datadog.android.rum.internal.toAction
4444
import com.datadog.android.rum.internal.toError
4545
import com.datadog.android.rum.internal.toLongTask
4646
import com.datadog.android.rum.internal.toView
47-
import com.datadog.android.rum.internal.utils.buildDDTagsString
4847
import com.datadog.android.rum.internal.utils.hasUserData
4948
import com.datadog.android.rum.internal.utils.newRumEventWriteOperation
5049
import com.datadog.android.rum.internal.vitals.VitalInfo
@@ -617,8 +616,7 @@ internal open class RumViewScope(
617616
configuration = ErrorEvent.Configuration(sessionSampleRate = sampleRate)
618617
),
619618
service = datadogContext.service,
620-
version = datadogContext.version,
621-
ddtags = buildDDTagsString(datadogContext)
619+
version = datadogContext.version
622620
)
623621
}
624622
.apply {
@@ -1154,8 +1152,7 @@ internal open class RumViewScope(
11541152
),
11551153
connectivity = datadogContext.networkInfo.toViewConnectivity(),
11561154
service = datadogContext.service,
1157-
version = datadogContext.version,
1158-
ddtags = buildDDTagsString(datadogContext)
1155+
version = datadogContext.version
11591156
).apply {
11601157
sessionEndedMetricDispatcher.onViewTracked(sessionId, this)
11611158
}
@@ -1329,8 +1326,7 @@ internal open class RumViewScope(
13291326
),
13301327
connectivity = datadogContext.networkInfo.toActionConnectivity(),
13311328
service = datadogContext.service,
1332-
version = datadogContext.version,
1333-
ddtags = buildDDTagsString(datadogContext)
1329+
version = datadogContext.version
13341330
)
13351331
}
13361332
.apply {
@@ -1445,8 +1441,7 @@ internal open class RumViewScope(
14451441
configuration = LongTaskEvent.Configuration(sessionSampleRate = sampleRate)
14461442
),
14471443
service = datadogContext.service,
1448-
version = datadogContext.version,
1449-
ddtags = buildDDTagsString(datadogContext)
1444+
version = datadogContext.version
14501445
)
14511446
}
14521447
.apply {

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

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import com.datadog.android.api.net.RequestFactory
1414
import com.datadog.android.api.storage.RawBatchEvent
1515
import com.datadog.android.core.internal.utils.join
1616
import com.datadog.android.internal.utils.toHexString
17+
import com.datadog.android.rum.RumAttributes
1718
import com.datadog.android.rum.internal.domain.event.RumViewEventFilter
1819
import java.security.DigestException
1920
import java.security.MessageDigest
@@ -56,14 +57,18 @@ internal class RumRequestFactory(
5657
}
5758

5859
private fun buildUrl(context: DatadogContext, executionContext: RequestExecutionContext): String {
59-
val queryParams = buildMap {
60-
put(RequestFactory.QUERY_PARAM_SOURCE, context.source)
60+
val queryParams = mapOf(
61+
RequestFactory.QUERY_PARAM_SOURCE to context.source,
62+
RequestFactory.QUERY_PARAM_TAGS to buildTags(
63+
context.service,
64+
context.version,
65+
context.sdkVersion,
66+
context.env,
67+
context.variant,
68+
executionContext
69+
)
6170

62-
val tags = buildTags(executionContext)
63-
if (tags.isNotEmpty()) {
64-
put(RequestFactory.QUERY_PARAM_TAGS, tags)
65-
}
66-
}
71+
)
6772

6873
val intakeUrl = "%s/api/v2/rum".format(
6974
Locale.US,
@@ -92,11 +97,24 @@ internal class RumRequestFactory(
9297
}
9398

9499
private fun buildTags(
100+
serviceName: String,
101+
version: String,
102+
sdkVersion: String,
103+
env: String,
104+
variant: String,
95105
executionContext: RequestExecutionContext
96106
) = buildString {
107+
append("${RumAttributes.SERVICE_NAME}:$serviceName").append(",")
108+
.append("${RumAttributes.APPLICATION_VERSION}:$version").append(",")
109+
.append("${RumAttributes.SDK_VERSION}:$sdkVersion").append(",")
110+
.append("${RumAttributes.ENV}:$env")
111+
112+
if (variant.isNotEmpty()) {
113+
append(",").append("${RumAttributes.VARIANT}:$variant")
114+
}
97115
if (executionContext.previousResponseCode != null) {
98116
// we had a previous failure
99-
append("${RETRY_COUNT_KEY}:${executionContext.attemptNumber}")
117+
append(",").append("${RETRY_COUNT_KEY}:${executionContext.attemptNumber}")
100118
append(",").append("${LAST_FAILURE_STATUS_KEY}:${executionContext.previousResponseCode}")
101119
}
102120
}

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/internal/net/RumRequestFactoryTest.kt‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import com.datadog.android.api.net.RequestExecutionContext
1212
import com.datadog.android.api.net.RequestFactory
1313
import com.datadog.android.api.storage.RawBatchEvent
1414
import com.datadog.android.core.internal.utils.join
15+
import com.datadog.android.rum.RumAttributes
1516
import com.datadog.android.rum.internal.domain.event.RumViewEventFilter
1617
import com.datadog.android.rum.utils.forge.Configurator
1718
import fr.xgouchet.elmyr.Forge
@@ -157,18 +158,22 @@ internal class RumRequestFactoryTest {
157158
}
158159

159160
private fun expectedUrl(endpointUrl: String): String {
160-
val queryTags = mutableListOf<String>()
161+
val queryTags = mutableListOf(
162+
"${RumAttributes.SERVICE_NAME}:${fakeDatadogContext.service}",
163+
"${RumAttributes.APPLICATION_VERSION}:${fakeDatadogContext.version}",
164+
"${RumAttributes.SDK_VERSION}:${fakeDatadogContext.sdkVersion}",
165+
"${RumAttributes.ENV}:${fakeDatadogContext.env}"
166+
)
161167

168+
if (fakeDatadogContext.variant.isNotEmpty()) {
169+
queryTags.add("${RumAttributes.VARIANT}:${fakeDatadogContext.variant}")
170+
}
162171
if (fakeExecutionContext.previousResponseCode != null) {
163172
queryTags.add("${RumRequestFactory.RETRY_COUNT_KEY}:${fakeExecutionContext.attemptNumber}")
164173
queryTags.add("${RumRequestFactory.LAST_FAILURE_STATUS_KEY}:${fakeExecutionContext.previousResponseCode}")
165174
}
166175

167-
return buildString {
168-
append("$endpointUrl/api/v2/rum?ddsource=${fakeDatadogContext.source}")
169-
if (queryTags.isNotEmpty()) {
170-
append("&ddtags=${queryTags.joinToString(",")}")
171-
}
172-
}
176+
return "$endpointUrl/api/v2/rum?ddsource=${fakeDatadogContext.source}" +
177+
"&ddtags=${queryTags.joinToString(",")}"
173178
}
174179
}

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

Lines changed: 0 additions & 86 deletions
This file was deleted.

features/dd-sdk-android-rum/src/testFixtures/kotlin/com/datadog/android/rum/utils/forge/AccessibilityForgeryFactory.kt renamed to features/dd-sdk-android-rum/src/test/kotlin/com/datadog/android/rum/utils/forge/AccessibilityForgeryFactory.kt

File renamed without changes.

0 commit comments

Comments
 (0)