Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: add w3c traceparent header injection #1288

Merged
merged 107 commits into from
Nov 27, 2024
Merged
Show file tree
Hide file tree
Changes from 105 commits
Commits
Show all changes
107 commits
Select commit Hold shift + click to select a range
1ddc5e3
feat(example): add apm screen (#1141)
abdelhamid-f-nasser Jul 17, 2024
0222c64
fix(android): resolve an OOM in network logs (#1244)
a7medev Jul 18, 2024
635cd47
fix(android): APM network logging(#1253)
kholood-ea Jul 23, 2024
4e81621
fix: use correct diff link for v13.0.0, v12.9.0 releases (#1198)
a7medev Apr 30, 2024
3073554
feat(ios): read env vars from .xcode.env in sourcemaps script (#1200)
a7medev May 13, 2024
8d16747
chore/update-podfile.lock
kholood-ea May 16, 2024
e546e93
feat: add w3c header generator
kholood-ea May 20, 2024
b8c2872
ci:fix lint
kholood-ea May 21, 2024
3f1ac4f
ci:fix ios tests
kholood-ea May 21, 2024
d08d3f2
feat:update header format
kholood-ea May 22, 2024
be7e75c
feat:update header format test case title
kholood-ea May 22, 2024
3032124
feat:Inject the W3C Header to Network Requests
kholood-ea May 26, 2024
04b9248
ci:fix lint
kholood-ea May 26, 2024
3891e75
feat:remove tracestate
kholood-ea May 27, 2024
a3d5ae8
feat: get feature flags from IOS
kholood-ea Jun 3, 2024
6af6690
ci: fix ios test
kholood-ea Jun 3, 2024
f74fa14
fix: modify function naming
kholood-ea Jun 3, 2024
112773d
fix: update APM test cases
kholood-ea Jun 3, 2024
044f1b2
fix: update native test cases naming
kholood-ea Jun 3, 2024
d99839a
feat(ios): w3c logs mapping
kholood-ea Jun 4, 2024
d5d8e26
fix: export number partial id
kholood-ea Jun 5, 2024
dd293d8
fix: modify partial id generator function
kholood-ea Jun 5, 2024
332b054
fix: modify partial id generator test cases
kholood-ea Jun 5, 2024
1d105aa
feat(example): add network request generators buttons
kholood-ea Jun 5, 2024
1c96a4a
ci: fix lint
kholood-ea Jun 6, 2024
648ca24
ci(example): add missing import
kholood-ea Jun 6, 2024
eaeb703
feat(android): map apm network logs
kholood-ea Jun 10, 2024
7297a63
feat(android): add W3C native modules & tests
kholood-ea Jun 13, 2024
af54f6a
feat: map w3c android native modules and test
kholood-ea Jun 13, 2024
6779026
feat: register w3c feature change listener
kholood-ea Jun 13, 2024
ce70ca5
feat: add feature flags
kholood-ea Jun 13, 2024
ff78ab6
feat: call updated feature flags
kholood-ea Jun 13, 2024
21c8917
fix: update object assigning
kholood-ea Jun 13, 2024
d748aa0
fix: remove comment
kholood-ea Jun 13, 2024
79a1f34
fix: modify test cases naming
kholood-ea Jun 26, 2024
18efd02
fix: generated header injection
kholood-ea Jul 15, 2024
1506e06
fix: fix variable neames
kholood-ea Jul 15, 2024
e758cab
fix: update test cases
kholood-ea Jul 15, 2024
6ae4b4e
fix(android): caught header null string
kholood-ea Jul 15, 2024
a9b111f
fix: update network log interface
kholood-ea Jul 23, 2024
b915581
fix (example): remove redundant button
kholood-ea Jul 24, 2024
a50f8a5
feat (example): add Enable/Disable APM buttons
kholood-ea Jul 24, 2024
e7453ec
fix: add w3c Attributes to network logs tests
kholood-ea Jul 24, 2024
bb3c290
fix: fix imports
kholood-ea Jul 24, 2024
d855bfe
feat(android) : add w3c attributes to APM network Logs
kholood-ea Jul 24, 2024
a69f8fe
chore: remove flipper
kholood-ea Jul 24, 2024
9e0afbb
fix: adjust spacing
kholood-ea Jul 24, 2024
7893846
fix: update test case
kholood-ea Jul 25, 2024
20ca10b
feat: migrate-Feature-Flag-APM-method-to-Core
ahmedAlaaInstabug Jul 25, 2024
807c544
fix: js testcases
ahmedAlaaInstabug Jul 25, 2024
efc0e8d
fix: js testcases
ahmedAlaaInstabug Jul 25, 2024
4b90955
fix: js testcases
ahmedAlaaInstabug Jul 25, 2024
c3a62d3
feat: add migrate APM into core in ios section
ahmedAlaaInstabug Jul 28, 2024
16c7a03
fix: js testcases
ahmedAlaaInstabug Jul 25, 2024
6abe243
feat: add migrate APM into core in ios section
ahmedAlaaInstabug Jul 28, 2024
e757c07
feat: add migrate APM into core in ios section
ahmedAlaaInstabug Jul 28, 2024
d878c35
fix: Pr comments
ahmedAlaaInstabug Jul 29, 2024
1bd7569
fix: PR comment
ahmedAlaaInstabug Aug 1, 2024
9bf4bbd
fix: Pr comments
ahmedAlaaInstabug Aug 20, 2024
a09e8e1
fix: added changelog item
ahmedAlaaInstabug Sep 11, 2024
e0fd17f
fix: feature flag listener
ahmedAlaaInstabug Sep 11, 2024
ec23cfa
fix: feature flag listener
ahmedAlaaInstabug Sep 11, 2024
a34fafc
feat: migrate w3c flags to APM core
kholood-ea Sep 16, 2024
efea1a8
feat(example): add apm screen (#1141)
abdelhamid-f-nasser Jul 17, 2024
fec8b0c
fix(android): resolve an OOM in network logs (#1244)
a7medev Jul 18, 2024
cc8a2cc
fix(android): APM network logging(#1253)
kholood-ea Jul 23, 2024
da392c0
feat: export upload utils (#1252)
a7medev Jul 31, 2024
7ebfe66
chore(example): remove flipper (#1259)
a7medev Jul 31, 2024
5fcd6c1
fix(android): pass network start time in microseconds (#1260)
ahmedAlaaInstabug Aug 2, 2024
4ed034a
feat: support feature flags with variants (#1230)
ahmedAlaaInstabug Aug 2, 2024
4fde2fd
chore(android): bump android sdk to v13.3.0 (#1261)
a7medev Aug 4, 2024
e200d6e
chore(ios): bump sdk to v13.3.0 (#1262)
a7medev Aug 4, 2024
3a15d98
release: v13.3.0 (#1263)
a7medev Aug 4, 2024
f8f76ee
chore: remove duplicate app flows entries in changelog (#1264)
a7medev Aug 4, 2024
a76874d
chore: remove duplicate execution traces deprecation in changelog (#1…
a7medev Aug 4, 2024
6d4991f
feat: navigation tracking support with expo router (#1270)
kholood-ea Aug 12, 2024
79088f3
chore: enhance expo router tracking support (#1272)
kholood-ea Aug 13, 2024
daa78bb
ci: generalize enterprise releases (#1275)
a7medev Aug 22, 2024
6da1d7b
ci: run tests before enterprise releases (#1271)
a7medev Aug 22, 2024
c4a62ce
ci: publish snapshots to npm (#1274)
a7medev Aug 22, 2024
ba2b40a
fix(ios): network log empty response body (#1273)
ahmedAlaaInstabug Sep 16, 2024
25f6aae
fix: drop non-error objects when reporting errors (#1279)
ahmedAlaaInstabug Sep 16, 2024
ee85f59
feat: capture client error in the network interceptor (#1257)
ahmedAlaaInstabug Sep 16, 2024
8910500
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
aba89d8
fix: networkLogIOS test case
kholood-ea Sep 16, 2024
de98c73
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
52b2c74
Merge remote-tracking branch 'origin/dev' into 7895
ahmedAlaaInstabug Sep 16, 2024
43eb293
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
51d0302
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
7ca2f15
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
2d25cda
fix: merge issues
ahmedAlaaInstabug Sep 16, 2024
0ff5cba
fix: remove logs
kholood-ea Sep 16, 2024
9f816f1
fix: refactore networkLogAndroid arguments
kholood-ea Sep 16, 2024
c1160e5
fix: merge issues
ahmedAlaaInstabug Sep 17, 2024
71ee382
fix: merge issues
ahmedAlaaInstabug Sep 17, 2024
a8c50a7
fix: move W3cExternalTraceAttributes to models
kholood-ea Sep 17, 2024
dadcfe4
fix: return expected value type from bridge
kholood-ea Sep 18, 2024
34ff4b4
fix: refactor method call
kholood-ea Sep 18, 2024
8590e94
fix: refactor method name
kholood-ea Sep 18, 2024
c9a30e7
fix: return expected value types of w3c flags
kholood-ea Sep 18, 2024
b24213e
chore: refactor constant names
kholood-ea Sep 18, 2024
8a9f07b
Merge branch 'dev' into fix/w3c-defects-revert
ahmedAlaaInstabug Nov 18, 2024
3a53200
fix: pod file
ahmedAlaaInstabug Nov 18, 2024
c110d1e
fix(android): fix w3c caught header
kholood-ea Nov 21, 2024
ff81603
fix (android): reporting network logs upon disabling w3c main feature…
kholood-ea Nov 25, 2024
e46f789
chore: add changelog
kholood-ea Nov 27, 2024
c680fa3
Merge branch 'dev' into fix/w3c-defects-revert
kholood-ea Nov 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ final class Constants {

final static String IBG_ON_NEW_MESSAGE_HANDLER = "IBGonNewMessageHandler";
final static String IBG_ON_NEW_REPLY_RECEIVED_CALLBACK = "IBGOnNewReplyReceivedCallback";

final static String IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK = "IBGOnNewW3CFlagsUpdateReceivedCallback";

final static String IBG_SESSION_REPLAY_ON_SYNC_CALLBACK_INVOCATION = "IBGSessionReplayOnSyncCallback";

}
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,16 @@

import com.facebook.react.bridge.Promise;
import com.facebook.react.bridge.ReactApplicationContext;
import com.facebook.react.bridge.ReactContextBaseJavaModule;
import com.facebook.react.bridge.ReactMethod;
import com.facebook.react.bridge.ReadableMap;
import com.instabug.apm.APM;
import com.instabug.apm.model.ExecutionTrace;
import com.instabug.apm.networking.APMNetworkLogger;
import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
import com.instabug.reactlibrary.utils.EventEmitterModule;
import com.instabug.apm.networkinterception.cp.APMCPNetworkLog;
import com.instabug.reactlibrary.utils.MainThreadHandler;

import org.json.JSONException;
import org.json.JSONObject;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;

import java.util.HashMap;
Expand All @@ -28,7 +27,7 @@

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

public class RNInstabugAPMModule extends ReactContextBaseJavaModule {
public class RNInstabugAPMModule extends EventEmitterModule {

public RNInstabugAPMModule(ReactApplicationContext reactApplicationContext) {
super(reactApplicationContext);
Expand Down Expand Up @@ -330,14 +329,41 @@ private void networkLogAndroid(final double requestStartTime,
final double statusCode,
final String responseContentType,
@Nullable final String errorDomain,
@Nullable final ReadableMap w3cAttributes,
@Nullable final String gqlQueryName,
@Nullable final String serverErrorMessage) {
@Nullable final String serverErrorMessage
) {
try {
APMNetworkLogger networkLogger = new APMNetworkLogger();

final boolean hasError = errorDomain != null && !errorDomain.isEmpty();
final String errorMessage = hasError ? errorDomain : null;
Boolean isW3cHeaderFound=false;
Long partialId=null;
Long networkStartTimeInSeconds=null;


try {
if (!w3cAttributes.isNull("isW3cHeaderFound")) {
isW3cHeaderFound = w3cAttributes.getBoolean("isW3cHeaderFound");
}

if (!w3cAttributes.isNull("partialId")) {
partialId =(long) w3cAttributes.getDouble("partialId");
networkStartTimeInSeconds = (long) w3cAttributes.getDouble("networkStartTimeInSeconds");
}

} catch (Exception e) {
e.printStackTrace();
}
APMCPNetworkLog.W3CExternalTraceAttributes w3cExternalTraceAttributes =
new APMCPNetworkLog.W3CExternalTraceAttributes(
isW3cHeaderFound,
partialId,
networkStartTimeInSeconds,
w3cAttributes.getString("w3cGeneratedHeader"),
w3cAttributes.getString("w3cCaughtHeader")
);
try {
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);
if (method != null) {
Expand All @@ -359,7 +385,7 @@ private void networkLogAndroid(final double requestStartTime,
errorMessage,
gqlQueryName,
serverErrorMessage,
null
w3cExternalTraceAttributes
);
} else {
Log.e("IB-CP-Bridge", "APMNetworkLogger.log was not found by reflection");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import android.util.Log;
import android.view.View;

import androidx.annotation.NonNull;
import androidx.annotation.UiThread;

import com.facebook.react.bridge.Arguments;
Expand All @@ -22,6 +23,8 @@
import com.facebook.react.bridge.WritableNativeArray;
import com.facebook.react.bridge.WritableNativeMap;
import com.facebook.react.uimanager.UIManagerModule;
import com.instabug.apm.InternalAPM;
import com.instabug.apm.configuration.cp.APMFeature;
import com.instabug.library.Feature;
import com.instabug.library.Instabug;
import com.instabug.library.InstabugColorTheme;
Expand All @@ -30,6 +33,11 @@
import com.instabug.library.LogLevel;
import com.instabug.library.ReproConfigurations;
import com.instabug.library.core.InstabugCore;
import com.instabug.library.internal.crossplatform.CoreFeature;
import com.instabug.library.internal.crossplatform.CoreFeaturesState;
import com.instabug.library.internal.crossplatform.FeaturesStateListener;
import com.instabug.library.internal.crossplatform.InternalCore;
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
import com.instabug.library.internal.module.InstabugLocale;
import com.instabug.library.invocation.InstabugInvocationEvent;
Expand Down Expand Up @@ -1148,6 +1156,105 @@ public void run() {
}
});
}
/**
* Register a listener for W3C flags value change
*/
@ReactMethod
public void registerW3CFlagsChangeListener(){

MainThreadHandler.runOnMainThread(new Runnable() {
@Override
public void run() {
try {
InternalCore.INSTANCE._setFeaturesStateListener(new FeaturesStateListener() {
@Override
public void invoke(@NonNull CoreFeaturesState featuresState) {
WritableMap params = Arguments.createMap();
params.putBoolean("isW3ExternalTraceIDEnabled", featuresState.isW3CExternalTraceIdEnabled());
params.putBoolean("isW3ExternalGeneratedHeaderEnabled", featuresState.isAttachingGeneratedHeaderEnabled());
params.putBoolean("isW3CaughtHeaderEnabled", featuresState.isAttachingCapturedHeaderEnabled());

sendEvent(Constants.IBG_ON_NEW_W3C_FLAGS_UPDATE_RECEIVED_CALLBACK, params);
}
});
}
catch (Exception e) {
e.printStackTrace();
}

}

});
}


/**
* Get first time Value of W3ExternalTraceID flag
*/
@ReactMethod
public void isW3ExternalTraceIDEnabled(Promise promise){

MainThreadHandler.runOnMainThread(new Runnable() {
@Override
public void run() {
try {
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_EXTERNAL_TRACE_ID));
}
catch (Exception e) {
e.printStackTrace();
promise.resolve(false);
}

}

});
}


/**
* Get first time Value of W3ExternalGeneratedHeader flag
*/
@ReactMethod
public void isW3ExternalGeneratedHeaderEnabled(Promise promise){

MainThreadHandler.runOnMainThread(new Runnable() {
@Override
public void run() {
try {
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_GENERATED_HEADER));
}
catch (Exception e) {
e.printStackTrace();
promise.resolve(false);
}

}

});
}

/**
* Get first time Value of W3CaughtHeader flag
*/
@ReactMethod
public void isW3CaughtHeaderEnabled(Promise promise){

MainThreadHandler.runOnMainThread(new Runnable() {
@Override
public void run() {
try {
promise.resolve(InternalCore.INSTANCE._isFeatureEnabled(CoreFeature.W3C_ATTACHING_CAPTURED_HEADER));
}
catch (Exception e) {
e.printStackTrace();
promise.resolve(false);
}

}

});
}


/**
* Map between the exported JS constant and the arg key in {@link ArgsRegistry}.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -204,4 +204,6 @@ public void testSetFlowAttribute() {
verify(APM.class, times(1));
APM.endUITrace();
}


}
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
import com.instabug.library.IssueType;
import com.instabug.library.ReproConfigurations;
import com.instabug.library.ReproMode;
import com.instabug.library.internal.crossplatform.CoreFeature;
import com.instabug.library.internal.crossplatform.InternalCore;
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
import com.instabug.library.featuresflags.model.IBGFeatureFlag;
import com.instabug.library.internal.module.InstabugLocale;
import com.instabug.library.ui.onboarding.WelcomeMessage;
Expand Down Expand Up @@ -635,4 +638,28 @@ public void testWillRedirectToStore() {
// then
mockInstabug.verify(() -> Instabug.willRedirectToStore());
}
@Test
public void testW3CExternalTraceIDFlag(){
Promise promise = mock(Promise.class);
InternalCore internalAPM = mock(InternalCore.class);
rnModule.isW3ExternalTraceIDEnabled(promise);
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_EXTERNAL_TRACE_ID);
verify(promise).resolve(expected);
}
@Test
public void testW3CExternalGeneratedHeaderFlag(){
Promise promise = mock(Promise.class);
InternalCore internalAPM = mock(InternalCore.class);
rnModule.isW3ExternalGeneratedHeaderEnabled(promise);
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_ATTACHING_GENERATED_HEADER);
verify(promise).resolve(expected);
}
@Test
public void testW3CCaughtHeaderFlag(){
Promise promise = mock(Promise.class);
InternalCore internalAPM = mock(InternalCore.class);
rnModule.isW3CaughtHeaderEnabled(promise);
boolean expected=internalAPM._isFeatureEnabled(CoreFeature.W3C_ATTACHING_CAPTURED_HEADER);
verify(promise).resolve(expected);
}
}
3 changes: 3 additions & 0 deletions examples/default/ios/InstabugTests/InstabugAPMTests.m
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
#import <Instabug/IBGAPM.h>
#import "Instabug/Instabug.h"
#import "IBGConstants.h"
#import "RNInstabug/IBGAPM+PrivateAPIs.h"

@interface InstabugAPMTests : XCTestCase
@property (nonatomic, retain) InstabugAPMBridge *instabugBridge;
Expand Down Expand Up @@ -176,4 +177,6 @@ - (void) testEndUITrace {
OCMVerify([mock endUITrace]);
}



@end
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ - (void)setUp {
}

- (void)testSetEnabled {

[self.bridge setEnabled:NO];
XCTAssertFalse(IBGCrashReporting.enabled);

[self.bridge setEnabled:YES];
XCTAssertTrue(IBGCrashReporting.enabled);

[self.bridge setEnabled:NO];
XCTAssertFalse(IBGCrashReporting.enabled);
}

- (void)testSendJSCrash {
Expand Down
Loading