Skip to content

Commit b8ab1c4

Browse files
AndrewAminInstabugAndrewAminInstabug
committed
chore: update native iOS snapshot and add the new network logging APIs.
1 parent e7b9551 commit b8ab1c4

File tree

9 files changed

+27
-18
lines changed

9 files changed

+27
-18
lines changed

‎examples/default/ios/Podfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ target 'InstabugExample' do
1818
# Flags change depending on the env values.
1919
flags = get_default_flags()
2020

21-
pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.2/Instabug.podspec'
21+
pod 'Instabug', :podspec => 'https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec'
2222
use_react_native!(
2323
:path => config[:reactNativePath],
2424
# Hermes is now enabled by default. Disable by setting this flag to false.

‎examples/default/ios/Podfile.lock

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PODS:
3838
- hermes-engine (0.72.3):
3939
- hermes-engine/Pre-built (= 0.72.3)
4040
- hermes-engine/Pre-built (0.72.3)
41-
- Instabug (13.4.2)
41+
- Instabug (13.4.3)
4242
- instabug-reactnative-ndk (0.1.0):
4343
- RCT-Folly (= 2021.07.22.00)
4444
- React-Core
@@ -476,7 +476,7 @@ PODS:
476476
- RCT-Folly (= 2021.07.22.00)
477477
- React-Core
478478
- RNInstabug (13.4.0):
479-
- Instabug (= 13.4.2)
479+
- Instabug (= 13.4.3)
480480
- React-Core
481481
- RNReanimated (3.5.4):
482482
- DoubleConversion
@@ -524,7 +524,7 @@ DEPENDENCIES:
524524
- FBReactNativeSpec (from `../node_modules/react-native/React/FBReactNativeSpec`)
525525
- glog (from `../node_modules/react-native/third-party-podspecs/glog.podspec`)
526526
- hermes-engine (from `../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec`)
527-
- Instabug (from `https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.2/Instabug.podspec`)
527+
- Instabug (from `https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec`)
528528
- instabug-reactnative-ndk (from `../node_modules/instabug-reactnative-ndk`)
529529
- libevent (~> 2.1.12)
530530
- OCMock
@@ -600,7 +600,7 @@ EXTERNAL SOURCES:
600600
:podspec: "../node_modules/react-native/sdks/hermes-engine/hermes-engine.podspec"
601601
:tag: hermes-2023-03-20-RNv0.72.0-49794cfc7c81fb8f69fd60c3bbf85a7480cc5a77
602602
Instabug:
603-
:podspec: https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.2/Instabug.podspec
603+
:podspec: https://ios-releases.instabug.com/custom/release-support_cp_network_filtering_obfuscation-add_reset_network_state/13.4.3/Instabug.podspec
604604
instabug-reactnative-ndk:
605605
:path: "../node_modules/instabug-reactnative-ndk"
606606
RCT-Folly:
@@ -706,7 +706,7 @@ SPEC CHECKSUMS:
706706
Google-Maps-iOS-Utils: f77eab4c4326d7e6a277f8e23a0232402731913a
707707
GoogleMaps: 032f676450ba0779bd8ce16840690915f84e57ac
708708
hermes-engine: 10fbd3f62405c41ea07e71973ea61e1878d07322
709-
Instabug: eee21d3c3aaf8f2576bfa840b170a96c3898a437
709+
Instabug: 12ea6990039094c48a7c7e8103ba8679c0833f5e
710710
instabug-reactnative-ndk: 960119a69380cf4cbe47ccd007c453f757927d17
711711
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
712712
OCMock: 589f2c84dacb1f5aaf6e4cec1f292551fe748e74
@@ -750,14 +750,14 @@ SPEC CHECKSUMS:
750750
ReactCommon: 3ccb8fb14e6b3277e38c73b0ff5e4a1b8db017a9
751751
RNCClipboard: 41d8d918092ae8e676f18adada19104fa3e68495
752752
RNGestureHandler: 6e46dde1f87e5f018a54fe5d40cd0e0b942b49ee
753-
RNInstabug: 8e7eb1df3f35b935dda661f5bb475f37cef595e6
753+
RNInstabug: 514b187e5b884939fd337eefb3244ea75e7e34f8
754754
RNReanimated: ab2e96c6d5591c3dfbb38a464f54c8d17fb34a87
755755
RNScreens: b21dc57dfa2b710c30ec600786a3fc223b1b92e7
756756
RNSVG: 80584470ff1ffc7994923ea135a3e5ad825546b9
757757
RNVectorIcons: 8b5bb0fa61d54cd2020af4f24a51841ce365c7e9
758758
SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
759759
Yoga: 8796b55dba14d7004f980b54bcc9833ee45b28ce
760760

761-
PODFILE CHECKSUM: 627a2a90e282a9fc9378b8a2ab29d94557724393
761+
PODFILE CHECKSUM: c4e288aeafe746a77427798d0e33069c948e4b76
762762

763763
COCOAPODS: 1.15.2

‎ios/RNInstabug/InstabugNetworkLoggerBridge.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111
*/
1212

1313
- (void)isNativeInterceptionEnabled:(RCTPromiseResolveBlock)resolve :(RCTPromiseRejectBlock)reject;
14-
- (void)resetNetworkLogToDefaultStateIOS;
14+
- (void)forceStartNetworkLoggingIOS;
15+
- (void)forceStopNetworkLoggingIOS;
1516
@end

‎ios/RNInstabug/InstabugNetworkLoggerBridge.m

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,14 @@ -(void)stopObserving {
4444
resolve(@(IBGNetworkLogger.isNativeNetworkInterceptionFeatureEnabled));
4545
}
4646

47-
RCT_EXPORT_METHOD(resetNetworkLogToDefaultStateIOS) {
48-
[IBGNetworkLogger resetNetworkLogToDefaultState];
47+
RCT_EXPORT_METHOD(forceStartNetworkLoggingIOS) {
48+
[IBGNetworkLogger forceStartNetworkLogging];
4949
}
5050

51+
RCT_EXPORT_METHOD(forceStopNetworkLoggingIOS) {
52+
[IBGNetworkLogger forceStopNetworkLogging];
53+
}
54+
55+
56+
5157
@end

‎ios/RNInstabug/Util/IBGNetworkLogger+CP.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ NS_ASSUME_NONNULL_BEGIN
3030
timestamp:(NSNumber * _Nullable)timestamp
3131
generatedW3CTraceparent:(NSString * _Nullable)generatedW3CTraceparent
3232
caughtedW3CTraceparent:(NSString * _Nullable)caughtedW3CTraceparent;
33-
+ (void)resetNetworkLogToDefaultState;
33+
+ (void)forceStartNetworkLogging;
34+
+ (void)forceStopNetworkLogging;
3435

3536
@end
3637

‎ios/native.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
$instabug = { :version => '13.4.2' }
1+
$instabug = { :version => '13.4.3' }
22

33
def use_instabug! (spec = nil)
44
version = $instabug[:version]

‎src/modules/Instabug.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,9 +269,9 @@ function handleIOSNativeInterception(config: InstabugConfig) {
269269
shouldEnableNativeInterception &&
270270
config.networkInterceptionMode === NetworkInterceptionMode.native
271271
) {
272-
NativeInstabug.setNetworkLoggingEnabled(true); // Enable native iOS automatic network logging.
272+
NativeNetworkLogger.forceStartNetworkLoggingIOS(); // Enable native iOS automatic network logging.
273273
} else {
274-
NativeNetworkLogger.resetNetworkLogToDefaultStateIOS(); // Disable native iOS automatic network logging.
274+
NativeNetworkLogger.forceStopNetworkLoggingIOS(); // Disable native iOS automatic network logging.
275275
}
276276
}
277277
}

‎src/native/NativeNetworkLogger.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ export interface NetworkLoggerNativeModule extends NativeModule {
55
// Network logging Flags //
66
isNativeInterceptionEnabled(): Promise<boolean>;
77
hasAPMNetworkPlugin(): Promise<boolean>;
8-
resetNetworkLogToDefaultStateIOS(): void; // iOS only
8+
forceStartNetworkLoggingIOS(): void; // iOS only;
9+
forceStopNetworkLoggingIOS(): void; // iOS only;
910
}
1011

1112
export const NativeNetworkLogger = NativeModules.IBGNetworkLogger;

‎src/utils/InstabugUtils.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@ export const reportNetworkLog = (network: NetworkData) => {
197197
network.requestBody,
198198
network.requestBodySize,
199199
network.method,
200-
network.url + '/js',
200+
network.url,
201201
network.requestContentType,
202202
responseHeaders,
203203
network.responseBody,
@@ -217,7 +217,7 @@ export const reportNetworkLog = (network: NetworkData) => {
217217
console.log('Andrew: ' + 'NetworkLogger -> NativeInstabug.networkLogIOS');
218218

219219
NativeInstabug.networkLogIOS(
220-
network.url + '/js',
220+
network.url,
221221
network.method,
222222
network.requestBody,
223223
network.requestBodySize,

0 commit comments

Comments
 (0)