Merge pull request #635 from Instabug/feature/end-app-launch

[MOB-6471] Add APM.endAppLaunch API

Author: Ali Abdelfattah

CHANGELOG.md

@@ -1,3 +1,6 @@
+## master
+* Adds APM.endAppLaunch API
+
 ## 10.9.1 (2021-10-13)
 
 * Bumps Instabug Android SDK to v10.9.1

InstabugSample/ios/InstabugSampleTests/InstabugAPMTests.m

@@ -77,6 +77,14 @@ - (void) testSetAppLaunchEnabled {
   OCMVerify([mock setAppLaunchEnabled:isEnabled]);
 }
 
+- (void) testEndAppLaunch {
+  id mock = OCMClassMock([IBGAPM class]);
+  
+  OCMStub([mock endAppLaunch]);
+  [self.instabugBridge endAppLaunch];
+  OCMVerify([mock endAppLaunch]);
+}
+
 - (void) testSetAutoUITraceEnabled {
   id mock = OCMClassMock([IBGAPM class]);
   BOOL isEnabled = YES;

__tests__/apm.spec.js

@@ -21,6 +21,7 @@ describe("APM Module", () => {
   const endExecutionTrace = sinon.spy(NativeModules.IBGAPM, "endExecutionTrace");
   const startUITrace = sinon.spy(NativeModules.IBGAPM, "startUITrace");
   const endUITrace = sinon.spy(NativeModules.IBGAPM, "endUITrace");
+  const endAppLaunch = sinon.spy(NativeModules.IBGAPM, "endAppLaunch");
 
   beforeEach(() => {
     IBGEventEmitter.removeAllListeners();
@@ -38,6 +39,12 @@ describe("APM Module", () => {
     expect(setAppLaunchEnabled.calledOnceWithExactly(true)).toBe(true);
   });
 
+  it("should call the native method endAppLaunch", () => {
+    APM.endAppLaunch();
+
+    expect(endAppLaunch.calledOnceWithExactly()).toBe(true);
+  });
+
   it("should call the native method setAutoUITraceEnabled", () => {
     APM.setAutoUITraceEnabled(true);
 

android/src/main/java/com/instabug/reactlibrary/RNInstabugAPMModule.java

@@ -107,6 +107,23 @@ public void run() {
         });
     }
 
+    /**
+     * Ends app launch
+     */
+    @ReactMethod
+    public void endAppLaunch() {
+        MainThreadHandler.runOnMainThread(new Runnable() {
+            @Override
+            public void run() {
+                try {
+                    APM.endAppLaunch();
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        });
+    }
+
     /**
      * Enables or disables auto UI tracing
      * @param isEnabled boolean indicating enabled or disabled.

android/src/test/java/com/instabug/reactlibrary/RNInstabugAPMModuleTest.java

@@ -104,6 +104,17 @@ public void givenTruesetEnabled_whenQuery_thenShouldCallNativeApiWithEnabled() {
         APM.setAppLaunchEnabled(true);
     }
 
+    @Test
+    public void given$endAppLaunch_whenQuery_thenShouldCallNativeApiWithEnabled() {
+        // given
+        PowerMockito.mockStatic(APM.class);
+        // when
+        apmModule.endAppLaunch();
+        // then
+        PowerMockito.verifyStatic(VerificationModeFactory.times(1));
+        APM.endAppLaunch();
+    }
+
     @Test
     public void givenString$startExecutionTrace_whenQuery_thenShouldCallNativeApi() {
 

index.d.ts

@@ -557,6 +557,11 @@ export namespace APM {
    * @param {boolean} isEnabled 
    */
   function setAppLaunchEnabled(isEnabled: boolean): void;
+  /**
+   * Ends the current session’s App Launch. Calling this API is optional, App Launches will still be captured and ended automatically by the SDK;
+   * this API just allows you to change when an App Launch actually ends.
+   */
+  function endAppLaunch(): void;
   /**
    * Enables or disables APM Network Metric
    * @param {boolean} isEnabled 

ios/RNInstabug/InstabugAPMBridge.h

@@ -14,6 +14,7 @@
 - (void)setLogLevel:(IBGLogLevel)_logLevel;
 - (void)setEnabled:(BOOL)isEnabled;
 - (void)setAppLaunchEnabled:(BOOL)isEnabled;
+- (void)endAppLaunch;
 - (void)setAutoUITraceEnabled:(BOOL)isEnabled;
 - (void)startExecutionTrace:(NSString *)name:(NSString *)id
                            :(RCTResponseSenderBlock)callBack;

ios/RNInstabug/InstabugAPMBridge.m

@@ -58,6 +58,10 @@ - (id) init
     IBGAPM.appLaunchEnabled = isEnabled;
 }
 
+RCT_EXPORT_METHOD(endAppLaunch) {
+    [IBGAPM endAppLaunch];
+}
+
 RCT_EXPORT_METHOD(setAutoUITraceEnabled:(BOOL)isEnabled) {
     IBGAPM.autoUITraceEnabled = isEnabled;
 }

jest/mockAPM.js

@@ -10,6 +10,7 @@ jest.mock("NativeModules", () => {
       endExecutionTrace: jest.fn(),
       startUITrace: jest.fn(),
       endUITrace: jest.fn(),
+      endAppLaunch: jest.fn(),
     },
     Instabug: {},
   };

modules/APM.js

@@ -55,6 +55,13 @@ export default {
         IBGAPM.setAppLaunchEnabled(isEnabled);
     },
 
+    /**
+     * Ends app launch
+     */
+    endAppLaunch() {
+        IBGAPM.endAppLaunch();
+    },
+
     /**
      * Enables or disables APM Network Metric
      * @param {boolean} isEnabled