Skip to content

Commit 915fb73

Browse files
a7medeva7medev
authored
Revert "feat: add w3c header (#1255)" (#1287)
This reverts commit 69d7c94.
1 parent 69d7c94 commit 915fb73

31 files changed

+36
-845
lines changed

‎android/native.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
project.ext.instabug = [
2-
version: '13.4.0'
2+
version: '13.3.0'
33
]
44

55
dependencies {

‎android/src/main/java/com/instabug/reactlibrary/Constants.java‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,4 @@ final class Constants {
99

1010
final static String IBG_ON_NEW_MESSAGE_HANDLER = "IBGonNewMessageHandler";
1111
final static String IBG_ON_NEW_REPLY_RECEIVED_CALLBACK = "IBGOnNewReplyReceivedCallback";
12-
13-
final static String IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewW3CFlagsUpdateReceivedCallback";
14-
1512
}

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

Lines changed: 7 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,17 @@
99

1010
import com.facebook.react.bridge.Promise;
1111
import com.facebook.react.bridge.ReactApplicationContext;
12+
import com.facebook.react.bridge.ReactContextBaseJavaModule;
1213
import com.facebook.react.bridge.ReactMethod;
13-
import com.facebook.react.bridge.ReadableMap;
1414
import com.instabug.apm.APM;
1515
import com.instabug.apm.model.ExecutionTrace;
1616
import com.instabug.apm.networking.APMNetworkLogger;
1717
import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
18-
import com.instabug.reactlibrary.utils.EventEmitterModule;
19-
import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
2018
import com.instabug.reactlibrary.utils.MainThreadHandler;
2119

20+
import org.json.JSONException;
21+
import org.json.JSONObject;
22+
import java.lang.reflect.InvocationTargetException;
2223
import java.lang.reflect.Method;
2324

2425
import java.util.HashMap;
@@ -27,7 +28,7 @@
2728

2829
import static com.instabug.reactlibrary.utils.InstabugUtil.getMethod;
2930

30-
public class RNInstabugAPMModule extends EventEmitterModule {
31+
public class RNInstabugAPMModule extends ReactContextBaseJavaModule {
3132

3233
public RNInstabugAPMModule(ReactApplicationContext reactApplicationContext) {
3334
super(reactApplicationContext);
@@ -329,41 +330,14 @@ private void networkLogAndroid(final double requestStartTime,
329330
final double statusCode,
330331
final String responseContentType,
331332
@Nullable final String errorDomain,
332-
@Nullable final ReadableMap w3cAttributes,
333333
@Nullable final String gqlQueryName,
334-
@Nullable final String serverErrorMessage
335-
) {
334+
@Nullable final String serverErrorMessage) {
336335
try {
337336
APMNetworkLogger networkLogger = new APMNetworkLogger();
338337

339338
final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
340339
final String errorMessage = hasError ? errorDomain : null;
341-
Boolean isW3cHeaderFound=false;
342-
Long partialId=null;
343-
Long networkStartTimeInSeconds=null;
344-
345-
346-
try {
347-
if (w3cAttributes.hasKey("isW3cHeaderFound")) {
348-
isW3cHeaderFound = w3cAttributes.getBoolean("isW3cHeaderFound");
349-
}
350340

351-
if (w3cAttributes.hasKey("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-
);
367341
try {
368342
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);
369343
if (method != null) {
@@ -385,7 +359,7 @@ private void networkLogAndroid(final double requestStartTime,
385359
errorMessage,
386360
gqlQueryName,
387361
serverErrorMessage,
388-
w3cExternalTraceAttributes
362+
null
389363
);
390364
} else {
391365
Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");

‎android/src/main/java/com/instabug/reactlibrary/RNInstabugReactnativeModule.java‎

Lines changed: 0 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
import android.util.Log;
99
import android.view.View;
1010

11-
import androidx.annotation.NonNull;
1211
import androidx.annotation.UiThread;
1312

1413
import com.facebook.react.bridge.Arguments;
@@ -23,8 +22,6 @@
2322
import com.facebook.react.bridge.WritableNativeArray;
2423
import com.facebook.react.bridge.WritableNativeMap;
2524
import com.facebook.react.uimanager.UIManagerModule;
26-
import com.instabug.apm.InternalAPM;
27-
import com.instabug.apm.configuration.cp.APMFeature;
2825
import com.instabug.library.Feature;
2926
import com.instabug.library.Instabug;
3027
import com.instabug.library.InstabugColorTheme;
@@ -33,11 +30,6 @@
3330
import com.instabug.library.LogLevel;
3431
import com.instabug.library.ReproConfigurations;
3532
import com.instabug.library.core.InstabugCore;
36-
import com.instabug.library.internal.crossplatform.CoreFeature;
37-
import com.instabug.library.internal.crossplatform.CoreFeaturesState;
38-
import com.instabug.library.internal.crossplatform.FeaturesStateListener;
39-
import com.instabug.library.internal.crossplatform.InternalCore;
40-
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
4133
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
4234
import com.instabug.library.internal.module.InstabugLocale;
4335
import com.instabug.library.invocation.InstabugInvocationEvent;
@@ -1156,105 +1148,6 @@ public void run() {
11561148
}
11571149
});
11581150
}
1159-
/**
1160-
* Register a listener for W3C flags value change
1161-
*/
1162-
@ReactMethod
1163-
public void registerW3CFlagsChangeListener(){
1164-
1165-
MainThreadHandler.runOnMainThread(new Runnable() {
1166-
@Override
1167-
public void run() {
1168-
try {
1169-
InternalCore.INSTANCE._setFeaturesStateListener(new FeaturesStateListener() {
1170-
@Override
1171-
public void invoke(@NonNull CoreFeaturesState featuresState) {
1172-
WritableMap params = Arguments.createMap();
1173-
params.putBoolean("isW3ExternalTraceIDEnabled", featuresState.isW3CExternalTraceIdEnabled());
1174-
params.putBoolean("isW3ExternalGeneratedHeaderEnabled", featuresState.isAttachingGeneratedHeaderEnabled());
1175-
params.putBoolean("isW3CaughtHeaderEnabled", featuresState.isAttachingCapturedHeaderEnabled());
1176-
1177-
sendEvent(Constants.IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK, params);
1178-
}
1179-
});
1180-
}
1181-
catch (Exception e) {
1182-
e.printStackTrace();
1183-
}
1184-
1185-
}
1186-
1187-
});
1188-
}
1189-
1190-
1191-
/**
1192-
* Get first time Value of W3ExternalTraceID flag
1193-
*/
1194-
@ReactMethod
1195-
public void isW3ExternalTraceIDEnabled(Promise promise){
1196-
1197-
MainThreadHandler.runOnMainThread(new Runnable() {
1198-
@Override
1199-
public void run() {
1200-
try {
1201-
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_EXTERNAL_TRACE_ID));
1202-
}
1203-
catch (Exception e) {
1204-
e.printStackTrace();
1205-
promise.resolve(false);
1206-
}
1207-
1208-
}
1209-
1210-
});
1211-
}
1212-
1213-
1214-
/**
1215-
* Get first time Value of W3ExternalGeneratedHeader flag
1216-
*/
1217-
@ReactMethod
1218-
public void isW3ExternalGeneratedHeaderEnabled(Promise promise){
1219-
1220-
MainThreadHandler.runOnMainThread(new Runnable() {
1221-
@Override
1222-
public void run() {
1223-
try {
1224-
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_GENERATED_HEADER));
1225-
}
1226-
catch (Exception e) {
1227-
e.printStackTrace();
1228-
promise.resolve(false);
1229-
}
1230-
1231-
}
1232-
1233-
});
1234-
}
1235-
1236-
/**
1237-
* Get first time Value of W3CaughtHeader flag
1238-
*/
1239-
@ReactMethod
1240-
public void isW3CaughtHeaderEnabled(Promise promise){
1241-
1242-
MainThreadHandler.runOnMainThread(new Runnable() {
1243-
@Override
1244-
public void run() {
1245-
try {
1246-
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_CAPTURED_HEADER));
1247-
}
1248-
catch (Exception e) {
1249-
e.printStackTrace();
1250-
promise.resolve(false);
1251-
}
1252-
1253-
}
1254-
1255-
});
1256-
}
1257-
12581151

12591152
/**
12601153
* Map between the exported JS constant and the arg key in {@link ArgsRegistry}.

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,6 +204,4 @@ public void testSetFlowAttribute() {
204204
verify(APM.class, times(1));
205205
APM.endUITrace();
206206
}
207-
208-
209207
}

‎android/src/test/java/com/instabug/reactlibrary/RNInstabugReactnativeModuleTest.java‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@
1818
import com.instabug.library.IssueType;
1919
import com.instabug.library.ReproConfigurations;
2020
import com.instabug.library.ReproMode;
21-
import com.instabug.library.internal.crossplatform.CoreFeature;
22-
import com.instabug.library.internal.crossplatform.InternalCore;
23-
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
2421
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
2522
import com.instabug.library.internal.module.InstabugLocale;
2623
import com.instabug.library.ui.onboarding.WelcomeMessage;
@@ -638,28 +635,4 @@ public void testWillRedirectToStore() {
638635
// then
639636
mockInstabug.verify(() -> Instabug.willRedirectToStore());
640637
}
641-
@Test
642-
public void testW3CExternalTraceIDFlag(){
643-
Promise promise = mock(Promise.class);
644-
InternalCore internalAPM = mock(InternalCore.class);
645-
rnModule.isW3ExternalTraceIDEnabled(promise);
646-
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_EXTERNAL_TRACE_ID);
647-
verify(promise).resolve(expected);
648-
}
649-
@Test
650-
public void testW3CExternalGeneratedHeaderFlag(){
651-
Promise promise = mock(Promise.class);
652-
InternalCore internalAPM = mock(InternalCore.class);
653-
rnModule.isW3ExternalGeneratedHeaderEnabled(promise);
654-
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_ATTACHING_GENERATED_HEADER);
655-
verify(promise).resolve(expected);
656-
}
657-
@Test
658-
public void testW3CCaughtHeaderFlag(){
659-
Promise promise = mock(Promise.class);
660-
InternalCore internalAPM = mock(InternalCore.class);
661-
rnModule.isW3CaughtHeaderEnabled(promise);
662-
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_ATTACHING_CAPTURED_HEADER);
663-
verify(promise).resolve(expected);
664-
}
665638
}

‎examples/default/e2e/reportBug.e2e.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ it('reports a bug', async () => {
1313
const floatingButton = getElement('floatingButton');
1414
await waitFor(floatingButton).toBeVisible().withTimeout(30000);
1515
await floatingButton.tap();
16-
const reportBugMenuItemButton = getElement('reportBugMenuItem');
17-
await waitFor(reportBugMenuItemButton).toBeVisible().withTimeout(30000);
18-
await reportBugMenuItemButton.tap();
16+
17+
await getElement('reportBugMenuItem').tap();
1918

2019
await getElement('emailField').typeText(mockData.email);
2120
await getElement('commentField').typeText(mockData.bugComment);

‎examples/default/ios/InstabugTests/InstabugAPMTests.m‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
#import <Instabug/IBGAPM.h>
1414
#import "Instabug/Instabug.h"
1515
#import "IBGConstants.h"
16-
#import "RNInstabug/IBGAPM+PrivateAPIs.h"
1716

1817
@interface InstabugAPMTests : XCTestCase
1918
@property (nonatomic, retain) InstabugAPMBridge *instabugBridge;
@@ -177,6 +176,4 @@ - (void) testEndUITrace {
177176
OCMVerify([mock endUITrace]);
178177
}
179178

180-
181-
182179
@end

‎examples/default/ios/InstabugTests/InstabugCrashReportingTests.m‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,11 @@ - (void)setUp {
1919
}
2020

2121
- (void)testSetEnabled {
22-
23-
[self.bridge setEnabled:NO];
24-
XCTAssertFalse(IBGCrashReporting.enabled);
25-
2622
[self.bridge setEnabled:YES];
2723
XCTAssertTrue(IBGCrashReporting.enabled);
2824

25+
[self.bridge setEnabled:NO];
26+
XCTAssertFalse(IBGCrashReporting.enabled);
2927
}
3028

3129
- (void)testSendNonFatalErrorJsonCrash {

0 commit comments

Comments
 (0)