Carrier info (signalfx#66)

Author: mhennoch

android/src/main/java/com/splunkotelreactnative/SplunkOtelReactNativeModule.java

@@ -17,6 +17,7 @@
 
 package com.splunkotelreactnative;
 
+import android.app.Application;
 import android.content.ContextWrapper;
 import android.util.Log;
 
@@ -35,6 +36,9 @@
 import com.splunkotelreactnative.crash.CrashEventAttributeExtractor;
 import com.splunkotelreactnative.crash.CrashReporter;
 import com.splunkotelreactnative.exporter.disk.DiskBufferingExporterFactory;
+import com.splunkotelreactnative.exporter.network.CurrentNetwork;
+import com.splunkotelreactnative.exporter.network.CurrentNetworkAttributesExtractor;
+import com.splunkotelreactnative.exporter.network.CurrentNetworkProvider;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -60,6 +64,7 @@ public class SplunkOtelReactNativeModule extends ReactContextBaseJavaModule {
   private final long moduleStartTime;
   private volatile SpanExporter exporter;
   private volatile CrashReporter crashReporter;
+  private CurrentNetworkProvider currentNetworkProvider;
 
   public SplunkOtelReactNativeModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -85,6 +90,8 @@ public void initialize(ReadableMap configMap, Promise promise) {
 
     String endpointWithAuthentication = beaconEndpoint + "?auth=" + accessToken;
 
+    currentNetworkProvider = CurrentNetworkProvider.createAndStart((Application) getReactApplicationContext().getApplicationContext());
+
     exporter = createExporter(endpointWithAuthentication, getReactApplicationContext(),
       mapReader.getEnableDiskBuffering(), mapReader.getMaxStorageUseMb());
 
@@ -124,6 +131,11 @@ public void export(ReadableArray spanMaps, Promise promise) {
 
     List<SpanData> spanDataList = new ArrayList<>();
 
+    CurrentNetwork network = currentNetworkProvider.refreshNetworkStatus();
+    CurrentNetworkAttributesExtractor networkAttributesExtractor = new CurrentNetworkAttributesExtractor();
+    Attributes networkAttributes = networkAttributesExtractor.extract(network);
+    setGlobalAttributes(networkAttributes);
+
     for (int i = 0; i < spanMaps.size(); i++) {
       ReadableMap spanMap = spanMaps.getMap(i);
       SpanMapReader mapReader = new SpanMapReader(spanMap);
@@ -142,7 +154,7 @@ public void export(ReadableArray spanMaps, Promise promise) {
         return;
       }
 
-      Attributes attributes = attributesFromMap(mapReader.getAttributes());
+      Attributes attributes = attributesFromMap(mapReader.getAttributes()).toBuilder().putAll(networkAttributes).build();
       ReactSpanData spanData = new ReactSpanData(spanProperties, attributes, context, parentContext,
         Collections.emptyList());
 
@@ -166,10 +178,15 @@ public void setSessionId(String sessionId) {
 
   @ReactMethod
   public void setGlobalAttributes(ReadableMap attributeMap) {
+    Attributes attributesFromMap = attributesFromMap(attributeMap);
+    setGlobalAttributes(attributesFromMap);
+  }
+
+  private void setGlobalAttributes(Attributes attributes) {
     CrashReporter currentCrashReporter = crashReporter;
 
     if (currentCrashReporter != null) {
-      currentCrashReporter.updateGlobalAttributes(attributesFromMap(attributeMap));
+      currentCrashReporter.updateGlobalAttributes(attributes);
     }
   }
 
@@ -198,7 +215,7 @@ private SpanExporter createExporter(String endpoint, ContextWrapper application,
         .setEncoder(new CustomZipkinEncoder())
         .build());
     }
-    return DiskBufferingExporterFactory.setupDiskBuffering(endpoint, application, maxStorageUseMb);
+    return DiskBufferingExporterFactory.setupDiskBuffering(endpoint, application, maxStorageUseMb, currentNetworkProvider);
   }
 
   @NonNull

android/src/main/java/com/splunkotelreactnative/exporter/disk/DiskBufferingExporterFactory.java

@@ -18,9 +18,7 @@
 import zipkin2.reporter.okhttp3.OkHttpSender;
 
 public class DiskBufferingExporterFactory {
-  public static SpanExporter setupDiskBuffering(String endpoint, ContextWrapper application, int maxStorageUseMb) {
-    CurrentNetworkProvider currentNetworkProvider = CurrentNetworkProvider.createAndStart((Application) application.getApplicationContext());
-
+  public static SpanExporter setupDiskBuffering(String endpoint, ContextWrapper application, int maxStorageUseMb, CurrentNetworkProvider currentNetworkProvider) {
     Sender sender = OkHttpSender.newBuilder().endpoint(endpoint).build();
     File spanFilesPath = FileUtils.getSpansDirectory(application);
     BandwidthTracker bandwidthTracker = new BandwidthTracker();

android/src/main/java/com/splunkotelreactnative/exporter/network/CurrentNetworkAttributesExtractor.java

@@ -0,0 +1,37 @@
+package com.splunkotelreactnative.exporter.network;
+
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CARRIER_ICC;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CARRIER_MCC;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CARRIER_MNC;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CARRIER_NAME;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CONNECTION_SUBTYPE;
+import static io.opentelemetry.semconv.trace.attributes.SemanticAttributes.NET_HOST_CONNECTION_TYPE;
+
+import androidx.annotation.Nullable;
+import io.opentelemetry.api.common.AttributeKey;
+import io.opentelemetry.api.common.Attributes;
+import io.opentelemetry.api.common.AttributesBuilder;
+
+public final class CurrentNetworkAttributesExtractor {
+
+  public Attributes extract(CurrentNetwork network) {
+    AttributesBuilder builder =
+      Attributes.builder()
+        .put(NET_HOST_CONNECTION_TYPE, network.getState().getHumanName());
+
+    setIfNotNull(builder, NET_HOST_CONNECTION_SUBTYPE, network.getSubType());
+    setIfNotNull(builder, NET_HOST_CARRIER_NAME, network.getCarrierName());
+    setIfNotNull(builder, NET_HOST_CARRIER_MCC, network.getCarrierCountryCode());
+    setIfNotNull(builder, NET_HOST_CARRIER_MNC, network.getCarrierNetworkCode());
+    setIfNotNull(builder, NET_HOST_CARRIER_ICC, network.getCarrierIsoCountryCode());
+
+    return builder.build();
+  }
+
+  private static void setIfNotNull(
+    AttributesBuilder builder, AttributeKey<String> key, @Nullable String value) {
+    if (value != null) {
+      builder.put(key, value);
+    }
+  }
+}

example/__tests__/e2e/configs/wdio.ios.local.conf.ts

@@ -28,6 +28,7 @@ export const config: Options.Testrunner = {
       'appium:deviceName': 'iPhone 15 Pro',
       'appium:platformVersion': '17.0',
       'appium:automationName': 'XCUITest',
+      'appium:autoAcceptAlerts': true,
       //TODO find local app file
       'appium:app': 'SplunkOtelReactNativeExample.app'
     },

example/__tests__/e2e/configs/wdio.ios.sauce.conf.ts

@@ -35,6 +35,8 @@ export const config: Options.Testrunner = {
       'appium:deviceName': 'iPhone Instant Simulator',
       'appium:automationName': 'XCUITest',
       'appium:app': 'storage:filename=SplunkOtelReactNativeExample.zip',
+      'appium:autoAcceptAlerts': true,
+      'appium:autoDismissAlerts': true,
       'sauce:options': {
         tunnelIdentifier: process.env.SAUCE_TUNNEL_ID,
       },

example/android/app/src/main/AndroidManifest.xml

@@ -2,6 +2,8 @@
   xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <!-- <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> -->
 
     <application
       android:name=".MainApplication"

example/ios/Podfile.lock

@@ -497,7 +497,7 @@ PODS:
     - RCT-Folly (= 2021.07.22.00)
     - React-Core
   - SocketRocket (0.6.1)
-  - splunk-otel-react-native (0.1.1):
+  - splunk-otel-react-native (0.2.0):
     - DeviceKit (~> 4.0)
     - PLCrashReporter (~> 1.11)
     - React-Core
@@ -739,7 +739,7 @@ SPEC CHECKSUMS:
   ReactCommon: 91ece8350ebb3dd2be9cef662abd78b6948233c0
   RNScreens: 3c2d122f5e08c192e254c510b212306da97d2581
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
-  splunk-otel-react-native: 35ecfed848370d2b2c36d02bd86fb2dfd92d917c
+  splunk-otel-react-native: b82a0b557bfd9518cd9d36b2e79b04227642bb02
   Yoga: 86fed2e4d425ee4c6eab3813ba1791101ee153c6
   YogaKit: f782866e155069a2cca2517aafea43200b01fd5a