diff --git a/services/src/main/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorImpl.kt b/services/src/main/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorImpl.kt index 43468514a..80883b7f9 100644 --- a/services/src/main/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorImpl.kt +++ b/services/src/main/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorImpl.kt @@ -85,7 +85,13 @@ internal class NetworkDetectorImpl( /** * Builds a network for non-cellular networks. */ - private fun buildNetwork(networkState: NetworkState) = CurrentNetwork(networkState) + private fun buildNetwork(networkState: NetworkState): CurrentNetwork { + val carrier = carrierFinder.get() + return CurrentNetwork( + state = networkState, + carrier = carrier, + ) + } /** * Builds a cellular network with carrier and subtype information. diff --git a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.kt b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.kt index 7626d7f2e..c5c3e6e09 100644 --- a/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.kt +++ b/services/src/test/java/io/opentelemetry/android/internal/services/network/detector/NetworkDetectorTest.kt @@ -67,6 +67,8 @@ class NetworkDetectorTest { every { connectivityManager.getNetworkCapabilities(network) } returns networkCapabilities every { networkCapabilities.hasTransport(any()) } returns false // default every { telephonyManager.simOperatorName } returns "JibroCom" // default + every { telephonyManager.simOperator } returns "JibroComSimOperator" // default + every { telephonyManager.simCountryIso } returns "JibroComSimCountryIso" // default // Mock telephony feature as available by default every { packageManager.hasSystemFeature(PackageManager.FEATURE_TELEPHONY) } returns true @@ -106,7 +108,19 @@ class NetworkDetectorTest { every { networkCapabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) } returns true val networkDetector = NetworkDetector.create(context) val currentNetwork = networkDetector.detectCurrentNetwork() - assertThat(currentNetwork).isEqualTo(CurrentNetwork(NetworkState.TRANSPORT_WIFI)) + assertThat(currentNetwork).isEqualTo( + CurrentNetwork( + NetworkState.TRANSPORT_WIFI, + carrier = + Carrier( + -1, + name = "JibroCom", + mobileCountryCode = "Jib", + mobileNetworkCode = "roComSimOperator", + isoCountryCode = "JibroComSimCountryIso", + ), + ), + ) } @Test