Skip to content

[ANDROID] Specify locale for string case conversions #1009

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marco-saia-datadog merged 1 commit into from
Oct 13, 2025
+7 −6
Merged

[ANDROID] Specify locale for string case conversions #1009

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ internal fun List<JSONFirstPartyHost>.asFirstPartyHosts(): Map<String, Set<Traci

internal fun List<String>.asTracingHeaderTypes(): Set<TracingHeaderType> {
return this.mapNotNull {
when (it.lowercase()) {
when (it.lowercase(Locale.US)) {
"datadog" -> TracingHeaderType.DATADOG
"b3" -> TracingHeaderType.B3
"b3multi" -> TracingHeaderType.B3MULTI
Expand Down
8 changes: 4 additions & 4 deletions packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1309,7 +1309,7 @@ internal class DdSdkTest {
mapOf(
"match" to match,
"propagatorTypes" to headerTypes.map {
it.name.lowercase()
it.name.lowercase(Locale.US)
}.toReadableArray()
).toReadableMap()
)
Expand Down Expand Up @@ -1367,7 +1367,7 @@ internal class DdSdkTest {
mapOf(
"match" to match,
"propagatorTypes" to listOf(
TracingHeaderType.DATADOG.name.lowercase(),
TracingHeaderType.DATADOG.name.lowercase(Locale.US),
forge.aString()
).toReadableArray()
).toReadableMap()
Expand Down Expand Up @@ -1427,15 +1427,15 @@ internal class DdSdkTest {
mapOf(
"match" to host,
"propagatorTypes" to listOf(
TracingHeaderType.DATADOG.name.lowercase()
TracingHeaderType.DATADOG.name.lowercase(Locale.US)
).toReadableArray()
).toReadableMap()
)
firstPartyHosts.add(
mapOf(
"match" to host,
"propagatorTypes" to listOf(
TracingHeaderType.B3.name.lowercase()
TracingHeaderType.B3.name.lowercase(Locale.US)
).toReadableArray()
).toReadableMap()
)
Expand Down
3 changes: 2 additions & 1 deletion packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import com.facebook.react.bridge.JavaOnlyArray
import com.facebook.react.bridge.JavaOnlyMap
import com.facebook.react.bridge.ReadableArray
import com.facebook.react.bridge.ReadableMap
import java.util.Locale

fun Map<*, *>.toReadableMap(): ReadableMap {
val keysAndValues = mutableListOf<Any?>()
Expand All @@ -33,7 +34,7 @@ fun Map<String, Set<TracingHeaderType>>.toFirstPartyHostsReadableArray(): Readab
"match" to it.key,
"propagatorTypes" to it.value.map {
tracingHeaderType ->
tracingHeaderType.toString().lowercase()
tracingHeaderType.toString().lowercase(Locale.US)
}.toReadableArray()
).toReadableMap()
)
Expand Down
Loading