merge

embrace-io · Aug 9, 2024 · b259b7d · b259b7d
2 parents 971ed36 + 521b29e
commit b259b7d
Show file tree

Hide file tree

Showing 17 changed files with 1,357 additions and 1,896 deletions.
diff --git a/examples/react-native-test-suite/.gitignore b/examples/react-native-test-suite/.gitignore
@@ -38,6 +38,7 @@ ios/Pods
 node_modules/
 npm-debug.log
 yarn-error.log
+.yarn/*
 
 # BUCK
 buck-out/

diff --git a/integration-tests/basic-test-app/app/_layout.tsx b/integration-tests/basic-test-app/app/_layout.tsx
@@ -14,7 +14,14 @@ SplashScreen.preventAutoHideAsync();
 export default function RootLayout() {
   useEffect(() => {
     const init = async () => {
-      const hasStarted = await initEmbrace();
+      await initEmbrace({
+        sdkConfig: {
+          ios: {
+            appId: "abcdf",
+            endpointBaseUrl: "http://localhost:8877",
+          },
+        },
+      });
     };
 
     init();

diff --git a/integration-tests/basic-test-app/ios/Embrace-Info.plist b/integration-tests/basic-test-app/ios/Embrace-Info.plist
diff --git a/packages/core/RNEmbrace.podspec b/packages/core/RNEmbrace.podspec
@@ -17,5 +17,5 @@ Pod::Spec.new do |s|
   s.source = {:path => "ios/RNEmbrace/"}
 
   s.dependency 'React-Core'
-  s.dependency 'EmbraceIO-DEV'
+  s.dependency 'EmbraceIO', '6.3.0'
 end
diff --git a/packages/core/android/src/main/java/io/embrace/embracewrapper/EmbraceManagerModule.java b/packages/core/android/src/main/java/io/embrace/embracewrapper/EmbraceManagerModule.java
@@ -53,7 +53,8 @@ public void isStarted(Promise promise) {
     }
 
     @ReactMethod
-    public void startNativeEmbraceSDK(Promise promise) {
+    public void startNativeEmbraceSDK(ReadableMap config, Promise promise) {
+        // config for now is only used to setup the iOS SDK, the Android SDK reads its config from a file
         try{
             Embrace.getInstance().start(this.context.getApplicationContext(), false, Embrace.AppFramework.REACT_NATIVE);
             promise.resolve(true);
@@ -435,11 +436,11 @@ public void logNetworkClientError(String url,
     }
 
     @ReactMethod()
-    public void startSpan(String name, String parentSpanId, Double startTimeNanos, Promise promise) {
+    public void startSpan(String name, String parentSpanId, Double startTimeMs, Promise promise) {
         try{
             Long startTime = null;
-            if(startTimeNanos != null){
-                startTime = startTimeNanos.longValue();
+            if(startTimeMs != null && startTimeMs > 0){
+                startTime = startTimeMs.longValue();
             }
             promise.resolve(Embrace.getInstance().getReactNativeInternalInterface().startSpan(name, parentSpanId, startTime));
         }catch(Exception e){
@@ -487,9 +488,9 @@ private List<Map<String, Object>> transformListReadableMapToListMap(ReadableArra
                 if (readableMap != null) {
                     Map<String, Object> map = readableMap.toHashMap();
                     // TODO Change when Android/iOS replace time in nano for ms
-                    if (map.containsKey("timestampNanos") && map.get("timestampNanos") instanceof Double) {
-                        double timestampNanos = (Double) map.get("timestampNanos");
-                        map.put("timestampNanos", (long) timestampNanos);
+                    if (map.containsKey("timestampMs") && map.get("timestampMs") instanceof Double) {
+                        double timestampMs = (Double) map.get("timestampMs");
+                        map.put("timestampMs", (long) timestampMs);
                     }
                     objectMapList.add(map);
                 }
@@ -502,12 +503,13 @@ private List<Map<String, Object>> transformListReadableMapToListMap(ReadableArra
     }
 
     @ReactMethod()
-    public void stopSpan(String spanId, String errorCodeString, Double endTimeNanos, Promise promise) {
+    public void stopSpan(String spanId, String errorCodeString, Double endTimeMs, Promise promise) {
         try{
             Long endTime = null;
-            if(endTimeNanos != null){
-                endTime = endTimeNanos.longValue();
+            if(endTimeMs != null && endTimeMs > 0){
+                endTime = endTimeMs.longValue();
             }
+
             ErrorCode errorCodeInstance = this.getSpanErrorCodebyString(errorCodeString);
             promise.resolve(Embrace.getInstance().getReactNativeInternalInterface().stopSpan(spanId, errorCodeInstance, endTime));
         }catch(Exception e){
@@ -535,11 +537,21 @@ public void addSpanEventToSpan(String spanId, String name, Double time, Readable
     }
 
     @ReactMethod()
-    public void recordCompletedSpan(String name, Double startTimeNanos, Double endTimeNanos, String errorCodeString, String parentSpanId, ReadableMap attributes, ReadableArray events, Promise promise) {
+    public void recordCompletedSpan(String name, Double startTimeMs, Double endTimeMs, String errorCodeString, String parentSpanId, ReadableMap attributes, ReadableArray events, Promise promise) {
         try{
             ErrorCode errorCodeInstance = this.getSpanErrorCodebyString(errorCodeString);
 
-            promise.resolve(Embrace.getInstance().getReactNativeInternalInterface().recordCompletedSpan(name, startTimeNanos.longValue(), endTimeNanos.longValue(), errorCodeInstance, parentSpanId, this.convertToReadableMap(attributes), this.transformListReadableMapToListMap(events)));
+            Long startTime = null;
+            if(startTimeMs != null && startTimeMs > 0){
+                startTime = startTimeMs.longValue();
+            }
+
+            Long endTime = null;
+            if(endTimeMs != null && endTimeMs > 0){
+                endTime = endTimeMs.longValue();
+            }
+
+            promise.resolve(Embrace.getInstance().getReactNativeInternalInterface().recordCompletedSpan(name, startTime, endTime, errorCodeInstance, parentSpanId, this.convertToReadableMap(attributes), this.transformListReadableMapToListMap(events)));
         }catch(Exception e){
             promise.resolve(false);
         }

diff --git a/packages/core/ios/RNEmbrace/EmbraceManager.m b/packages/core/ios/RNEmbrace/EmbraceManager.m
@@ -9,7 +9,7 @@ @interface RCT_EXTERN_MODULE(EmbraceManager, NSObject)
 RCT_EXTERN_METHOD(isStarted:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)
 
-RCT_EXTERN_METHOD(startNativeEmbraceSDK:(NSString *)appId
+RCT_EXTERN_METHOD(startNativeEmbraceSDK:(NSDictionary)config
                   resolver:(RCTPromiseResolveBlock)resolve
                   rejecter:(RCTPromiseRejectBlock)reject)