From b832f48ccfe4177dcb7411a39f34a3c84e56c46e Mon Sep 17 00:00:00 2001 From: Archish Thakkar Date: Mon, 29 Apr 2024 09:53:39 +0530 Subject: [PATCH 1/3] fix: :bug: for throwing NPE during initializing middleware android sdk --- .../MiddlewareReactNativeModule.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java index 0ad0fef..1b64d67 100644 --- a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java +++ b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java @@ -80,9 +80,9 @@ public void initialize(ReadableMap configMap, Promise promise) { .setGlobalAttributes(attributesFromMap(globalAttributes)) .setDeploymentEnvironment(deploymentEnvironment) .disableActivityLifecycleMonitoring() - .build(Objects.requireNonNull(getReactApplicationContext().getCurrentActivity()).getApplication()); + .build((Application) getReactApplicationContext().getApplicationContext()); - if("true".equals(sessionRecording)) { + if ("true".equals(sessionRecording)) { Middleware middleware = Middleware.getInstance(); middleware.startNativeRecording(getCurrentActivity()); } @@ -103,7 +103,8 @@ public void nativeCrash() { new Thread(() -> { try { Thread.sleep(2000); - } catch (InterruptedException e) {} + } catch (InterruptedException e) { + } throw new RuntimeException("test crash"); }).start(); } @@ -242,7 +243,7 @@ private ReactSpanProperties propertiesFromMap(SpanMapReader mapReader) { final ReadableArray readerEvents = mapReader.getEvents(); final List newEvents = new ArrayList<>(); - for(int index = 0; index < readerEvents.size(); index++) { + for (int index = 0; index < readerEvents.size(); index++) { final ReadableMap readableMap = readerEvents.getMap(index); final EventData eventData = EventData.create( Long.parseLong(Objects.requireNonNull(readableMap.getString("time"))), From 72badd89bc906281fa90963ec4c87cb02046231a Mon Sep 17 00:00:00 2001 From: Archish Thakkar Date: Mon, 29 Apr 2024 12:54:02 +0530 Subject: [PATCH 2/3] chore: :art: using boolean true constant --- .../com/middlewarereactnative/MiddlewareReactNativeModule.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java index 1b64d67..184c1af 100644 --- a/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java +++ b/android/src/main/java/com/middlewarereactnative/MiddlewareReactNativeModule.java @@ -82,7 +82,7 @@ public void initialize(ReadableMap configMap, Promise promise) { .disableActivityLifecycleMonitoring() .build((Application) getReactApplicationContext().getApplicationContext()); - if ("true".equals(sessionRecording)) { + if (Boolean.TRUE.toString().equals(sessionRecording)) { Middleware middleware = Middleware.getInstance(); middleware.startNativeRecording(getCurrentActivity()); } From 44f9fdca2fa67feff0e327d6ddebb60427bf0224 Mon Sep 17 00:00:00 2001 From: Archish Thakkar Date: Mon, 29 Apr 2024 14:40:01 +0530 Subject: [PATCH 3/3] chore: :arrow_up: updated middleware sdk --- android/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/build.gradle b/android/build.gradle index c462420..5f3e6bc 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -84,7 +84,7 @@ dependencies { // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin //noinspection GradleDynamicVersion implementation "com.facebook.react:react-native:+" - implementation ('io.github.middleware-labs:android-sdk:2.0.4') + implementation ('io.github.middleware-labs:android-sdk:2.0.5') implementation 'io.opentelemetry.android:instrumentation:+' implementation 'io.opentelemetry:opentelemetry-sdk:+' runtimeOnly 'io.opentelemetry:opentelemetry-semconv:1.30.1-alpha'