Rename APM APIs

Author: AliAbdelfattah

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

@@ -9,7 +9,7 @@
 import com.facebook.react.bridge.ReactContextBaseJavaModule;
 import com.facebook.react.bridge.ReactMethod;
 import com.instabug.apm.APM;
-import com.instabug.apm.model.Trace;
+import com.instabug.apm.model.ExecutionTrace;
 import com.instabug.bug.BugReporting;
 import com.instabug.chat.Chats;
 import com.instabug.library.Feature;
@@ -25,7 +25,7 @@ public class RNInstabugAPMModule extends ReactContextBaseJavaModule {
     public RNInstabugAPMModule(ReactApplicationContext reactApplicationContext) {
         super(reactApplicationContext);
     }
-    HashMap<String, Trace> traces = new HashMap<String, Trace>();
+    HashMap<String, ExecutionTrace> traces = new HashMap<String, ExecutionTrace>();
 
     @Nonnull
     @Override
@@ -70,16 +70,16 @@ public void run() {
     }
 
     /**
-     * Starts a trace
+     * Starts an execution trace
      * @param name string name of the trace.
      */
     @ReactMethod
-    public void startTrace(final String name, final String id) {
+    public void startExecutionTrace(final String name, final String id) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
                 try {
-                    Trace trace = APM.startTrace(name);
+                    ExecutionTrace trace = APM.startExecutionTrace(name);
                     traces.put(id,trace);
                 } catch (Exception e) {
                     e.printStackTrace();
@@ -95,7 +95,7 @@ public void run() {
      * @param value attribute value. Null to remove attribute
      */
     @ReactMethod
-    public void setTraceAttribute(final String id, final String key, final String value) {
+    public void setExecutionTraceAttribute(final String id, final String key, final String value) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {
@@ -113,7 +113,7 @@ public void run() {
      * @param id string id of the trace.
      */
     @ReactMethod
-    public void endTrace(final String id) {
+    public void endExecutionTrace(final String id) {
         MainThreadHandler.runOnMainThread(new Runnable() {
             @Override
             public void run() {

index.d.ts

@@ -134,8 +134,8 @@ export namespace APM {
   function setEnabled(isEnabled: boolean): void;
   function setAppLaunchEnabled(isEnabled: boolean): void;
   function setNetworkEnabledIOS(isEnabled: boolean): void;
-  function setUIHangEnabled(isEnabled: boolean): void;
-  function startTrace(name: string): Trace;
+  function setAutoUITraceEnabled(isEnabled: boolean): void;
+  function startExecutionTrace(name: string): Trace;
   function startUITrace(name: string): void;
   function endUITrace(): void;
 }

ios/RNInstabug/InstabugAPMBridge.h

@@ -13,11 +13,11 @@
 
 - (void)setEnabled:(BOOL)isEnabled;
 - (void)setAppLaunchEnabled:(BOOL)isEnabled;
-- (void)setUIHangEnabled:(BOOL)isEnabled;
-- (void)startTrace:(NSString *)name:(NSString *)id;
-- (void)setTraceAttribute:(NSString *)id:(NSString *)key
-                         :(NSString *)value;
-- (void)endTrace:(NSString *)id;
+- (void)setAutoUITraceEnabled:(BOOL)isEnabled;
+- (void)startExecutionTrace:(NSString *)name:(NSString *)id;
+- (void)setExecutionTraceAttribute:(NSString *)id:(NSString *)key
+                                  :(NSString *)value;
+- (void)endExecutionTrace:(NSString *)id;
 - (void)startUITrace:(NSString *)name;
 - (void)endUITrace;
 

ios/RNInstabug/InstabugAPMBridge.m

@@ -2,7 +2,7 @@
 
 #import "InstabugAPMBridge.h"
 #import <Instabug/IBGAPM.h>
-#import <Instabug/IBGTrace.h>
+#import <Instabug/IBGExecutionTrace.h>
 #import <asl.h>
 #import <React/RCTLog.h>
 #import <os/log.h>
@@ -43,22 +43,22 @@ - (id) init
     IBGAPM.appLaunchEnabled = isEnabled;
 }
 
-RCT_EXPORT_METHOD(setUIHangEnabled:(BOOL)isEnabled) {
-    IBGAPM.UIHangEnabled = isEnabled;
+RCT_EXPORT_METHOD(setAutoUITraceEnabled:(BOOL)isEnabled) {
+    IBGAPM.autoUITraceEnabled = isEnabled;
 }
 
-RCT_EXPORT_METHOD(startTrace:(NSString *)name :(NSString *)id) {
-    IBGTrace *trace = [IBGAPM startTraceWithName:name];
+RCT_EXPORT_METHOD(startExecutionTrace:(NSString *)name :(NSString *)id) {
+    IBGExecutionTrace *trace = [IBGAPM startExecutionTraceWithName:name];
     [traces setObject: trace forKey: id];
 }
 
-RCT_EXPORT_METHOD(setTraceAttribute:(NSString *)id :(NSString *)key :(NSString *)value) {
-    IBGTrace *trace = [traces objectForKey:id];
+RCT_EXPORT_METHOD(setExecutionTraceAttribute:(NSString *)id :(NSString *)key :(NSString *)value) {
+    IBGExecutionTrace *trace = [traces objectForKey:id];
     [trace setAttributeWithKey:key value:value];
 }
 
-RCT_EXPORT_METHOD(endTrace:(NSString *)id) {
-    IBGTrace *trace = [traces objectForKey:id];
+RCT_EXPORT_METHOD(endExecutionTrace:(NSString *)id) {
+    IBGExecutionTrace *trace = [traces objectForKey:id];
     [trace end];
 }
 

models/Trace.js

@@ -19,7 +19,7 @@ export default class Trace {
      * @param {string} value 
      */
     setAttribute(key, value) {
-        IBGAPM.setTraceAttribute(this.id, key, value);
+        IBGAPM.setExecutionTraceAttribute(this.id, key, value);
         this.attributes[key] = value;
     }
 
@@ -29,6 +29,6 @@ export default class Trace {
      * @param {string} value 
      */
     end() {
-        IBGAPM.endTrace(this.id);
+        IBGAPM.endExecutionTrace(this.id);
     }
 }

modules/APM.js

@@ -41,19 +41,19 @@ export default {
      * Enables or disables APM UI Responsivenes tracking feature
      * @param {boolean} isEnabled 
      */
-    setUIHangEnabled(isEnabled) {
+    setAutoUITraceEnabled(isEnabled) {
         if (Platform.OS === 'ios') {
-            IBGAPM.setUIHangEnabled(isEnabled);
+            IBGAPM.setAutoUITraceEnabled(isEnabled);
         }
     },
 
     /**
      * Starts a custom trace
      * @param {string} name 
      */
-    startTrace(name) {
+    startExecutionTrace(name) {
         const id = Date.now() + '';
-        IBGAPM.startTrace(name, id);
+        IBGAPM.startExecutionTrace(name, id);
         return new Trace(id, name);
     },