diff --git a/examples/react-native-test-suite/.gitignore b/examples/react-native-test-suite/.gitignore
index 9d4ee599..9c2d5299 100644
--- 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
index f38a5e53..a2054d55 100644
--- 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
deleted file mode 100644
index aa819598..00000000
--- a/integration-tests/basic-test-app/ios/Embrace-Info.plist
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- API_KEY
- abcdf
- CRASH_REPORT_ENABLED
-
- CONFIG_BASE_URL
- http://localhost:8877
- DATA_BASE_URL
- http://localhost:8877
- DATA_DEV_BASE_URL
- http://localhost:8877
- IMAGES_BASE_URL
- http://localhost:8877
- TEST_BASE_URL
- http://localhost:8877
-
-
\ No newline at end of file
diff --git a/packages/core/RNEmbrace.podspec b/packages/core/RNEmbrace.podspec
index 75fc14f6..7375f49b 100644
--- 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
index 7d7605c7..050c9835 100644
--- 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);
@@ -433,11 +434,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){
@@ -485,9 +486,9 @@ private List