release: v13.4.0 (#506)

a7medev · ahmedAlaaInstabug · ahmedAlaaInstabug · commit b58e491b72f0 · 2024-11-04T17:17:49.000+02:00
* chore(ios): bump sdk to v13.4.0 * chore(android): bump sdk to v13.4.0 * chore: bump sdk version to v13.4.0 * chore: update changelog * fix(ios): update native network logging method signature (#507) * fix(ios): update native network logging method signature * feat(example): add network logging in example --------- Co-authored-by: Ahmed alaa <aalaa@instabug.com>
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,12 +1,17 @@
 # Changelog
 
-## [Unreleased](https://github.com/Instabug/Instabug-Flutter/compare/v13.3.0...dev)
+## [13.4.0](https://github.com/Instabug/Instabug-Flutter/compare/v13.3.0...v13.4.0) (September 15, 2024)
 
 ### Added
 
 - Add support for masking screen names captured by Instabug through the `Instabug.setScreenNameMaskingCallback` API ([#500](https://github.com/Instabug/Instabug-Flutter/pull/500)).
 - Add support for tracing network requests from Instabug to services like Datadog and New Relic ([#481](https://github.com/Instabug/Instabug-Flutter/pull/481)).
 
+### Changed
+
+- Bump Instabug Android SDK to v13.4.0 ([#506](https://github.com/Instabug/Instabug-Flutter/pull/506)). [See release notes](https://github.com/Instabug/Instabug-Android/releases/tag/v13.4.0).
+- Bump Instabug iOS SDK to v13.4.0 ([#506](https://github.com/Instabug/Instabug-Flutter/pull/506)). [See release notes](https://github.com/Instabug/Instabug-iOS/releases/tag/13.4.0).
+
 ### Fixed
 
 - Fixed an issue with empty screen names captured in `InstabugNavigatorObserver` and fallback to `N/A` when the screen name is empty ([#505](https://github.com/Instabug/Instabug-Flutter/pull/505)), closes [#504](https://github.com/Instabug/Instabug-Flutter/issues/504).
diff --git a/android/build.gradle b/android/build.gradle
@@ -1,5 +1,5 @@
 group 'com.instabug.flutter'
-version '13.3.0'
+version '13.4.0'
 
 buildscript {
     repositories {
diff --git a/example/ios/InstabugTests/InstabugApiTests.m b/example/ios/InstabugTests/InstabugApiTests.m
@@ -4,10 +4,8 @@
 #import "InstabugApi.h"
 #import "Instabug/Instabug.h"
 #import "Util/Instabug+Test.h"
-#import "Util/IBGNetworkLogger+Test.h"
+#import "IBGNetworkLogger+CP.h"
 #import "Flutter/Flutter.h"
-#import "instabug_flutter/IBGAPM+PrivateAPIs.h"
-#import "instabug_flutter/IBGNetworkLogger+CP.h"
 
 @interface InstabugTests : XCTestCase
 
@@ -441,159 +439,14 @@ - (void)testNetworkLog {
                                               partialID:nil
                                               timestamp:nil
                                 generatedW3CTraceparent:nil
-                                 caughtedW3CTraceparent:nil
-               
-                                      
-
-              ]);
+                                 caughtedW3CTraceparent:nil]);
 }
-- (void)testNetworkLogWithW3Caught {
-    NSString *url = @"https://example.com";
-    NSString *requestBody = @"hi";
-    NSNumber *requestBodySize = @17;
-    NSString *responseBody = @"{\"hello\":\"world\"}";
-    NSNumber *responseBodySize = @153;
-    NSString *method = @"POST";
-    NSNumber *responseCode = @201;
-    NSString *responseContentType = @"application/json";
-    NSNumber *duration = @23000;
-    NSNumber *startTime = @1670156107523;
-    NSDictionary *requestHeaders = @{ @"Accepts": @"application/json",@"traceparent":@"1234"};
-    NSDictionary *responseHeaders = @{ @"Content-Type": @"text/plain" };
-    NSDictionary *data = @{
-        @"url": url,
-        @"requestBody": requestBody,
-        @"requestBodySize": requestBodySize,
-        @"responseBody": responseBody,
-        @"responseBodySize": responseBodySize,
-        @"method": method,
-        @"responseCode": responseCode,
-        @"requestHeaders": requestHeaders,
-        @"responseHeaders": responseHeaders,
-        @"responseContentType": responseContentType,
-        @"duration": duration,
-        @"startTime": startTime,
-        @"isW3cHeaderFound":@1,
-        @"w3CCaughtHeader":@"1234"
-    };
-    
-    FlutterError* error;
-
-    [self.api networkLogData:data error:&error];
-    
-    OCMVerify([self.mNetworkLogger addNetworkLogWithUrl:url
-                                                 method:method
-                                            requestBody:requestBody
-                                        requestBodySize:requestBodySize.integerValue
-                                           responseBody:responseBody
-                                       responseBodySize:responseBodySize.integerValue
-                                           responseCode:(int32_t) responseCode.integerValue
-                                         requestHeaders:requestHeaders
-                                        responseHeaders:responseHeaders
-                                            contentType:responseContentType
-                                            errorDomain:nil
-                                              errorCode:0
-                                              startTime:startTime.integerValue * 1000
-                                               duration:duration.integerValue
-                                           gqlQueryName:nil
-                                     serverErrorMessage:nil
-                                          isW3cCaughted:@1
-                                              partialID:nil
-                                              timestamp:nil
-                                generatedW3CTraceparent:nil
-                                 caughtedW3CTraceparent:@"1234"
-               
-                                      
-
-              ]);
-}
-
-- (void)testNetworkLogWithW3GeneratedHeader {
-    NSString *url = @"https://example.com";
-    NSString *requestBody = @"hi";
-    NSNumber *requestBodySize = @17;
-    NSString *responseBody = @"{\"hello\":\"world\"}";
-    NSNumber *responseBodySize = @153;
-    NSString *method = @"POST";
-    NSNumber *responseCode = @201;
-    NSString *responseContentType = @"application/json";
-    NSNumber *duration = @23000;
-    NSNumber *startTime = @1670156107523;
-    NSDictionary *requestHeaders = @{ @"Accepts": @"application/json" };
-    NSDictionary *responseHeaders = @{ @"Content-Type": @"text/plain" };
-    NSDictionary *data = @{
-        @"url": url,
-        @"requestBody": requestBody,
-        @"requestBodySize": requestBodySize,
-        @"responseBody": responseBody,
-        @"responseBodySize": responseBodySize,
-        @"method": method,
-        @"responseCode": responseCode,
-        @"requestHeaders": requestHeaders,
-        @"responseHeaders": responseHeaders,
-        @"responseContentType": responseContentType,
-        @"duration": duration,
-        @"startTime": startTime,
-        @"isW3cHeaderFound": @0,
-        @"partialId": @12,
-        @"networkStartTimeInSeconds": @34,
-        @"w3CGeneratedHeader": @"12-34",
-        
-    };
-    FlutterError* error;
 
-    [self.api networkLogData:data error:&error];
-    
-    OCMVerify([self.mNetworkLogger addNetworkLogWithUrl:url
-                                                 method:method
-                                            requestBody:requestBody
-                                        requestBodySize:requestBodySize.integerValue
-                                           responseBody:responseBody
-                                       responseBodySize:responseBodySize.integerValue
-                                           responseCode:(int32_t) responseCode.integerValue
-                                         requestHeaders:requestHeaders
-                                        responseHeaders:responseHeaders
-                                            contentType:responseContentType
-                                            errorDomain:nil
-                                              errorCode:0
-                                              startTime:startTime.integerValue * 1000
-                                               duration:duration.integerValue
-                                           gqlQueryName:nil
-                                     serverErrorMessage:nil
-                                          isW3cCaughted:@0
-                                              partialID:@12
-                                              timestamp:@34
-                                generatedW3CTraceparent:@"12-34"
-                                 caughtedW3CTraceparent:nil
-               
-                                      
-
-              ]);
-}
 - (void)testWillRedirectToAppStore {
     FlutterError *error;
     [self.api willRedirectToStoreWithError:&error];
 
     OCMVerify([self.mInstabug willRedirectToAppStore]);
 }
-- (void)testisW3CFeatureFlagsEnabled{
-    FlutterError *error;
-
-    id mock = OCMClassMock([IBGNetworkLogger class]);
-    NSNumber *isW3cExternalTraceIDEnabled = @(YES);
-
-    OCMStub([mock w3ExternalTraceIDEnabled]).andReturn([isW3cExternalTraceIDEnabled boolValue]);
-    OCMStub([mock w3ExternalGeneratedHeaderEnabled]).andReturn([isW3cExternalTraceIDEnabled boolValue]);
-    OCMStub([mock w3CaughtHeaderEnabled]).andReturn([isW3cExternalTraceIDEnabled boolValue]);
-    
-
-    
-    NSDictionary<NSString* , NSNumber *> * result= [self.api isW3CFeatureFlagsEnabledWithError:&error];
-        
-    XCTAssertEqual(result[@"isW3cExternalTraceIDEnabled"],isW3cExternalTraceIDEnabled);
-    XCTAssertEqual(result[@"isW3cExternalGeneratedHeaderEnabled"],isW3cExternalTraceIDEnabled);
-    XCTAssertEqual(result[@"isW3cCaughtHeaderEnabled"],isW3cExternalTraceIDEnabled);
-    
-}
 
 @end
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
   - Flutter (1.0.0)
   - Instabug (13.4.0)
-  - instabug_flutter (13.3.0):
+  - instabug_flutter (13.4.0):
     - Flutter
     - Instabug (= 13.4.0)
   - OCMock (3.6)
@@ -25,9 +25,9 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   Instabug: 183aa1e038d01ddc000f06835f46a9ea1f6c992b
-  instabug_flutter: ea66471d4f6c1a26ca7de18bf7046d271c863d4a
+  instabug_flutter: 2cae2dc6f1d9e2442154886b3740a47f3429d239
   OCMock: 5ea90566be239f179ba766fd9fbae5885040b992
 
 PODFILE CHECKSUM: 8f7552fd115ace1988c3db54a69e4a123c448f84
 
-COCOAPODS: 1.15.2
+COCOAPODS: 1.14.3
diff --git a/example/ios/Runner.xcodeproj/project.pbxproj b/example/ios/Runner.xcodeproj/project.pbxproj
@@ -87,7 +87,6 @@
 		CC359DB82937720C0067A924 /* ApmApiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ApmApiTests.m; sourceTree = "<group>"; };
 		CC3D69E6293F47FC000DCE54 /* ArgsRegistryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = ArgsRegistryTests.m; sourceTree = "<group>"; };
 		CC78720E293CA8EE008CB2A5 /* Instabug+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Instabug+Test.h"; sourceTree = "<group>"; };
-		CC787211293CAB28008CB2A5 /* IBGNetworkLogger+Test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "IBGNetworkLogger+Test.h"; sourceTree = "<group>"; };
 		CC9925D1293DEB0B001FD3EE /* CrashReportingApiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = CrashReportingApiTests.m; sourceTree = "<group>"; };
 		CC9925D4293DF534001FD3EE /* FeatureRequestsApiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FeatureRequestsApiTests.m; sourceTree = "<group>"; };
 		CC9925D6293DFB03001FD3EE /* InstabugLogApiTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = InstabugLogApiTests.m; sourceTree = "<group>"; };
@@ -216,7 +215,6 @@
 			children = (
 				BE26C80C2BD55575009FECCF /* IBGCrashReporting+CP.h */,
 				CC78720E293CA8EE008CB2A5 /* Instabug+Test.h */,
-				CC787211293CAB28008CB2A5 /* IBGNetworkLogger+Test.h */,
 				CC198C62293E2392007077C8 /* IBGSurvey+Test.h */,
 			);
 			path = Util;
diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -2,10 +2,10 @@ import 'dart:async';
 import 'dart:developer';
 import 'dart:io';
 import 'dart:convert';
-import 'package:http/http.dart' as http;
 
 import 'package:flutter/material.dart';
 import 'package:instabug_flutter/instabug_flutter.dart';
+import 'package:instabug_http_client/instabug_http_client.dart';
 import 'package:instabug_flutter_example/src/app_routes.dart';
 import 'package:instabug_flutter_example/src/widget/nested_view.dart';
 
diff --git a/example/lib/src/components/network_content.dart b/example/lib/src/components/network_content.dart
@@ -10,6 +10,8 @@ class NetworkContent extends StatefulWidget {
 }
 
 class _NetworkContentState extends State<NetworkContent> {
+  final http = InstabugHttpClient();
+
   final endpointUrlController = TextEditingController();
 
   @override
diff --git a/example/pubspec.lock b/example/pubspec.lock
@@ -115,7 +115,15 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "13.3.0"
+    version: "13.4.0"
+  instabug_http_client:
+    dependency: "direct main"
+    description:
+      name: instabug_http_client
+      sha256: "7d52803c0dd639f6dddbe07333418eb251ae02f3f9f4d30402517533ca692784"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.0"
   leak_tracker:
     dependency: transitive
     description:
diff --git a/example/pubspec.yaml b/example/pubspec.yaml
@@ -26,6 +26,7 @@ dependencies:
   http: ^0.13.0
   instabug_flutter:
     path: ../
+  instabug_http_client: ^2.4.0
 
 dev_dependencies:
   espresso: 0.2.0+5
@@ -35,6 +36,10 @@ dev_dependencies:
     sdk: flutter
   flutter_lints: 1.0.4
 
+dependency_overrides:
+  instabug_flutter:
+    path: ../
+
 # For information on the generic Dart part of this file, see the
 # following page: https://dart.dev/tools/pub/pubspec
 
diff --git a/ios/Classes/Modules/InstabugApi.m b/ios/Classes/Modules/InstabugApi.m
@@ -263,10 +263,10 @@ - (void)networkLogData:(NSDictionary<NSString *, id> *)data error:(FlutterError
     NSString *method = data[@"method"];
     NSString *requestBody = data[@"requestBody"];
     NSString *responseBody = data[@"responseBody"];
-    int32_t responseCode = [data[@"responseCode"] integerValue];
+    int32_t responseCode = (int32_t) [data[@"responseCode"] integerValue];
     int64_t requestBodySize = [data[@"requestBodySize"] integerValue];
     int64_t responseBodySize = [data[@"responseBodySize"] integerValue];
-    int32_t errorCode = [data[@"errorCode"] integerValue];
+    int32_t errorCode = (int32_t) [data[@"errorCode"] integerValue];
     NSString *errorDomain = data[@"errorDomain"];
     NSDictionary *requestHeaders = data[@"requestHeaders"];
     if ([requestHeaders count] == 0) {
@@ -286,32 +286,27 @@ - (void)networkLogData:(NSDictionary<NSString *, id> *)data error:(FlutterError
         serverErrorMessage = data[@"serverErrorMessage"];
     }
 
-    SEL networkLogSEL = NSSelectorFromString(@"addNetworkLogWithUrl:method:requestBody:requestBodySize:responseBody:responseBodySize:responseCode:requestHeaders:responseHeaders:contentType:errorDomain:errorCode:startTime:duration:gqlQueryName:serverErrorMessage:");
-
-    if ([[IBGNetworkLogger class] respondsToSelector:networkLogSEL]) {
-        NSInvocation *inv = [NSInvocation invocationWithMethodSignature:[[IBGNetworkLogger class] methodSignatureForSelector:networkLogSEL]];
-        [inv setSelector:networkLogSEL];
-        [inv setTarget:[IBGNetworkLogger class]];
-
-        [inv setArgument:&(url) atIndex:2];
-        [inv setArgument:&(method) atIndex:3];
-        [inv setArgument:&(requestBody) atIndex:4];
-        [inv setArgument:&(requestBodySize) atIndex:5];
-        [inv setArgument:&(responseBody) atIndex:6];
-        [inv setArgument:&(responseBodySize) atIndex:7];
-        [inv setArgument:&(responseCode) atIndex:8];
-        [inv setArgument:&(requestHeaders) atIndex:9];
-        [inv setArgument:&(responseHeaders) atIndex:10];
-        [inv setArgument:&(contentType) atIndex:11];
-        [inv setArgument:&(errorDomain) atIndex:12];
-        [inv setArgument:&(errorCode) atIndex:13];
-        [inv setArgument:&(startTime) atIndex:14];
-        [inv setArgument:&(duration) atIndex:15];
-        [inv setArgument:&(gqlQueryName) atIndex:16];
-        [inv setArgument:&(serverErrorMessage) atIndex:17];
-
-        [inv invoke];
-    }
+    [IBGNetworkLogger addNetworkLogWithUrl:url
+                                    method:method
+                               requestBody:requestBody
+                           requestBodySize:requestBodySize
+                              responseBody:responseBody
+                          responseBodySize:responseBodySize
+                              responseCode:responseCode
+                            requestHeaders:requestHeaders
+                           responseHeaders:responseHeaders
+                               contentType:contentType
+                               errorDomain:errorDomain
+                                 errorCode:errorCode
+                                 startTime:startTime
+                                  duration:duration
+                              gqlQueryName:gqlQueryName
+                        serverErrorMessage:serverErrorMessage
+                             isW3cCaughted:nil
+                                 partialID:nil
+                                 timestamp:nil
+                   generatedW3CTraceparent:nil
+                    caughtedW3CTraceparent:nil];
 }
 
 - (void)willRedirectToStoreWithError:(FlutterError * _Nullable __autoreleasing *)error {
diff --git a/ios/Classes/Util/IBGNetworkLogger+CP.h b/ios/Classes/Util/IBGNetworkLogger+CP.h
@@ -2,12 +2,7 @@
 
 NS_ASSUME_NONNULL_BEGIN
 
-
-@interface IBGNetworkLogger (PrivateAPIs)
-
-@property (class, atomic, assign) BOOL w3ExternalTraceIDEnabled;
-@property (class, atomic, assign) BOOL w3ExternalGeneratedHeaderEnabled;
-@property (class, atomic, assign) BOOL w3CaughtHeaderEnabled;
+@interface IBGNetworkLogger (CP)
 
 + (void)disableAutomaticCapturingOfNetworkLogs;
 
@@ -33,22 +28,6 @@ NS_ASSUME_NONNULL_BEGIN
      generatedW3CTraceparent:(NSString * _Nullable)generatedW3CTraceparent
       caughtedW3CTraceparent:(NSString * _Nullable)caughtedW3CTraceparent;
 
-+ (void)addNetworkLogWithUrl:(NSString *_Nonnull)url
-                      method:(NSString *_Nonnull)method
-                 requestBody:(NSString *_Nonnull)request
-             requestBodySize:(int64_t)requestBodySize
-                responseBody:(NSString *_Nonnull)response
-            responseBodySize:(int64_t)responseBodySize
-                responseCode:(int32_t)code
-              requestHeaders:(NSDictionary *_Nonnull)requestHeaders
-             responseHeaders:(NSDictionary *_Nonnull)responseHeaders
-                 contentType:(NSString *_Nonnull)contentType
-                 errorDomain:(NSString *_Nullable)errorDomain
-                   errorCode:(int32_t)errorCode
-                   startTime:(int64_t)startTime
-                    duration:(int64_t) duration
-                gqlQueryName:(NSString * _Nullable)gqlQueryName;
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ios/instabug_flutter.podspec b/ios/instabug_flutter.podspec
diff --git a/pubspec.yaml b/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ class NetworkContent extends StatefulWidget {`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`class _NetworkContentState extends State<NetworkContent> {`
	`13`	`+ final http = InstabugHttpClient();`
	`14`	`+`
`13`	`15`	`final endpointUrlController = TextEditingController();`
`14`	`16`
`15`	`17`	`@override`