99
1010import com .facebook .react .bridge .Promise ;
1111import com .facebook .react .bridge .ReactApplicationContext ;
12- import com .facebook .react .bridge .ReactContextBaseJavaModule ;
1312import com .facebook .react .bridge .ReactMethod ;
13+ import com .facebook .react .bridge .ReadableMap ;
1414import com .instabug .apm .APM ;
1515import com .instabug .apm .model .ExecutionTrace ;
1616import com .instabug .apm .networking .APMNetworkLogger ;
1717import com .instabug .apm .networkinterception .cp .APMCPNetworkLog ;
18+ import com .instabug .reactlibrary .utils .EventEmitterModule ;
19+ import com .instabug .apm .networkinterception .cp .APMCPNetworkLog ;
1820import com .instabug .reactlibrary .utils .MainThreadHandler ;
1921
20- import org .json .JSONException ;
21- import org .json .JSONObject ;
22-
23- import java .lang .reflect .InvocationTargetException ;
2422import java .lang .reflect .Method ;
2523
2624import java .util .HashMap ;
2927
3028import static com .instabug .reactlibrary .utils .InstabugUtil .getMethod ;
3129
32- public class RNInstabugAPMModule extends ReactContextBaseJavaModule {
30+ public class RNInstabugAPMModule extends EventEmitterModule {
3331
3432 public RNInstabugAPMModule (ReactApplicationContext reactApplicationContext ) {
3533 super (reactApplicationContext );
@@ -59,7 +57,6 @@ public void run() {
5957
6058 /**
6159 * Enables or disables APM.
62- *
6360 * @param isEnabled boolean indicating enabled or disabled.
6461 */
6562 @ ReactMethod
@@ -78,7 +75,6 @@ public void run() {
7875
7976 /**
8077 * Enables or disables app launch tracking.
81- *
8278 * @param isEnabled boolean indicating enabled or disabled.
8379 */
8480 @ ReactMethod
@@ -114,7 +110,6 @@ public void run() {
114110
115111 /**
116112 * Enables or disables auto UI tracing
117- *
118113 * @param isEnabled boolean indicating enabled or disabled.
119114 */
120115 @ ReactMethod
@@ -213,6 +208,7 @@ public void run() {
213208 * Starts an execution trace
214209 *
215210 * @param name string name of the trace.
211+ *
216212 * @deprecated see {@link #startFlow(String)}
217213 */
218214 @ Deprecated
@@ -243,6 +239,7 @@ public void run() {
243239 * @param id String id of the trace.
244240 * @param key attribute key
245241 * @param value attribute value. Null to remove attribute
242+ *
246243 * @deprecated see {@link #setFlowAttribute}
247244 */
248245 @ Deprecated
@@ -264,6 +261,7 @@ public void run() {
264261 * Ends a trace
265262 *
266263 * @param id string id of the trace.
264+ *
267265 * @deprecated see {@link #endFlow}
268266 */
269267 @ Deprecated
@@ -283,7 +281,6 @@ public void run() {
283281
284282 /**
285283 * Starts a UI trace
286- *
287284 * @param name string name of the UI trace.
288285 */
289286 @ ReactMethod
@@ -332,44 +329,71 @@ private void networkLogAndroid(final double requestStartTime,
332329 final double statusCode ,
333330 final String responseContentType ,
334331 @ Nullable final String errorDomain ,
332+ @ Nullable final ReadableMap w3cAttributes ,
335333 @ Nullable final String gqlQueryName ,
336- @ Nullable final String serverErrorMessage ) {
334+ @ Nullable final String serverErrorMessage
335+ ) {
337336 try {
338337 APMNetworkLogger networkLogger = new APMNetworkLogger ();
339338
340339 final boolean hasError = errorDomain != null && !errorDomain .isEmpty ();
341340 final String errorMessage = hasError ? errorDomain : null ;
341+ Boolean isW3cHeaderFound =false ;
342+ Long partialId =null ;
343+ Long networkStartTimeInSeconds =null ;
344+
342345
346+ try {
347+ if (!w3cAttributes .isNull ("isW3cHeaderFound" )) {
348+ isW3cHeaderFound = w3cAttributes .getBoolean ("isW3cHeaderFound" );
349+ }
350+
351+ if (!w3cAttributes .isNull ("partialId" )) {
352+ partialId =(long ) w3cAttributes .getDouble ("partialId" );
353+ networkStartTimeInSeconds = (long ) w3cAttributes .getDouble ("networkStartTimeInSeconds" );
354+ }
355+
356+ } catch (Exception e ) {
357+ e .printStackTrace ();
358+ }
359+ APMCPNetworkLog .W3CExternalTraceAttributes w3cExternalTraceAttributes =
360+ new APMCPNetworkLog .W3CExternalTraceAttributes (
361+ isW3cHeaderFound ,
362+ partialId ,
363+ networkStartTimeInSeconds ,
364+ w3cAttributes .getString ("w3cGeneratedHeader" ),
365+ w3cAttributes .getString ("w3cCaughtHeader" )
366+ );
343367 try {
344368 Method method = getMethod (Class .forName ("com.instabug.apm.networking.APMNetworkLogger" ), "log" , long .class , long .class , String .class , String .class , long .class , String .class , String .class , String .class , String .class , String .class , long .class , int .class , String .class , String .class , String .class , String .class , APMCPNetworkLog .W3CExternalTraceAttributes .class );
345369 if (method != null ) {
346- method .invoke (
347- networkLogger ,
348- (long ) requestStartTime * 1000 ,
349- (long ) requestDuration ,
350- requestHeaders ,
351- requestBody ,
352- (long ) requestBodySize ,
353- requestMethod ,
354- requestUrl ,
355- requestContentType ,
356- responseHeaders ,
357- responseBody ,
358- (long ) responseBodySize ,
359- (int ) statusCode ,
360- responseContentType ,
361- errorMessage ,
362- gqlQueryName ,
363- serverErrorMessage ,
364- null
365- );
370+ method .invoke (
371+ networkLogger ,
372+ (long ) requestStartTime * 1000 ,
373+ (long ) requestDuration ,
374+ requestHeaders ,
375+ requestBody ,
376+ (long ) requestBodySize ,
377+ requestMethod ,
378+ requestUrl ,
379+ requestContentType ,
380+ responseHeaders ,
381+ responseBody ,
382+ (long )responseBodySize ,
383+ (int ) statusCode ,
384+ responseContentType ,
385+ errorMessage ,
386+ gqlQueryName ,
387+ serverErrorMessage ,
388+ w3cExternalTraceAttributes
389+ );
366390 } else {
367391 Log .e ("IB-CP-Bridge" , "APMNetworkLogger.log was not found by reflection" );
368392 }
369393 } catch (Throwable e ) {
370394 e .printStackTrace ();
371395 }
372- } catch (Throwable e ) {
396+ } catch (Throwable e ) {
373397 e .printStackTrace ();
374398 }
375399 }
0 commit comments