From 7d12cd87d7890d3ecd9c7269ae70d460b0f8ea72 Mon Sep 17 00:00:00 2001 From: Marco Saia Date: Mon, 13 Oct 2025 10:48:00 +0200 Subject: [PATCH] Android: specify locale for string case conversions --- .../com/datadog/reactnative/DdSdkConfigurationExt.kt | 2 +- .../src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt | 8 ++++---- .../src/test/kotlin/com/datadog/tools/unit/MapExt.kt | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt index bcffdbbf5..709e6bcf9 100644 --- a/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt +++ b/packages/core/android/src/main/kotlin/com/datadog/reactnative/DdSdkConfigurationExt.kt @@ -210,7 +210,7 @@ internal fun List.asFirstPartyHosts(): Map.asTracingHeaderTypes(): Set { return this.mapNotNull { - when (it.lowercase()) { + when (it.lowercase(Locale.US)) { "datadog" -> TracingHeaderType.DATADOG "b3" -> TracingHeaderType.B3 "b3multi" -> TracingHeaderType.B3MULTI diff --git a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt index 2d40963b6..5cda53616 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/reactnative/DdSdkTest.kt @@ -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() ) @@ -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() @@ -1427,7 +1427,7 @@ internal class DdSdkTest { mapOf( "match" to host, "propagatorTypes" to listOf( - TracingHeaderType.DATADOG.name.lowercase() + TracingHeaderType.DATADOG.name.lowercase(Locale.US) ).toReadableArray() ).toReadableMap() ) @@ -1435,7 +1435,7 @@ internal class DdSdkTest { mapOf( "match" to host, "propagatorTypes" to listOf( - TracingHeaderType.B3.name.lowercase() + TracingHeaderType.B3.name.lowercase(Locale.US) ).toReadableArray() ).toReadableMap() ) diff --git a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt index 6c1314821..e12dcc919 100644 --- a/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt +++ b/packages/core/android/src/test/kotlin/com/datadog/tools/unit/MapExt.kt @@ -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() @@ -33,7 +34,7 @@ fun Map>.toFirstPartyHostsReadableArray(): Readab "match" to it.key, "propagatorTypes" to it.value.map { tracingHeaderType -> - tracingHeaderType.toString().lowercase() + tracingHeaderType.toString().lowercase(Locale.US) }.toReadableArray() ).toReadableMap() )