firebase · tejasd · Feb 24, 2025 · Feb 24, 2025 · Feb 24, 2025 · Feb 24, 2025
diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-ruby-2.7
+2.7.4
diff --git a/FirebasePerformance/Sources/Instrumentation/FPRObjectInstrumentor.h b/FirebasePerformance/Sources/Instrumentation/FPRObjectInstrumentor.h
@@ -33,6 +33,12 @@ NS_ASSUME_NONNULL_BEGIN
  */
 - (void)registerObject:(id)object;
 
+/** Registers an instance of the delegate class to be instrumented.
+ *
+ *  @param proxy The instance to instrument.
+ */
+- (void)registerProxy:(id)proxy;
+
 @end
 
 /** This class allows the instrumentation of specific objects by isa swizzling specific instances

diff --git a/FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.h b/FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.h
@@ -31,4 +31,15 @@
               forSuperclass:(Class)superclass
             varFoundHandler:(void (^)(id ivar))varFoundHandler;
 
+/** Registers a proxy object for a given class and runs the onSuccess block whenever an ivar of the
+ *  given class is discovered on the proxy object.
+ *
+ *  @param proxy The proxy object whose ivars will be iterated.
+ *  @param protocol The protocol all ivars will be compared against. See varFoundHandler.
+ *  @param varFoundHandler The block to run when an ivar conformsToProtocol:protocol.
+ */
++ (void)registerProxyObject:(id)proxy
+                forProtocol:(Protocol *)protocol
+            varFoundHandler:(void (^)(id ivar))varFoundHandler;
+
 @end
diff --git a/FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.m b/FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.m
@@ -29,4 +29,15 @@ + (void)registerProxyObject:(id)proxy
   }
 }
 
++ (void)registerProxyObject:(id)proxy
+                forProtocol:(Protocol *)protocol
+            varFoundHandler:(void (^)(id ivar))varFoundHandler {
+  NSArray<id> *ivars = [GULSwizzler ivarObjectsForObject:proxy];
+  for (id ivar in ivars) {
+    if ([ivar conformsToProtocol:protocol]) {
+      varFoundHandler(ivar);
+    }
+  }
+}
+
 @end
diff --git a/...formance/Sources/Instrumentation/Network/Delegates/FPRNSURLConnectionDelegateInstrument.m b/...formance/Sources/Instrumentation/Network/Delegates/FPRNSURLConnectionDelegateInstrument.m
@@ -17,6 +17,7 @@
 #import "FirebasePerformance/Sources/Instrumentation/FPRClassInstrumentor.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRInstrument_Private.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.h"
+#import "FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRSelectorInstrumentor.h"
 #import "FirebasePerformance/Sources/Instrumentation/Network/Delegates/FPRNSURLConnectionDelegate.h"
 #import "FirebasePerformance/Sources/Instrumentation/Network/FPRNetworkInstrumentHelpers.h"
@@ -304,4 +305,13 @@ - (void)registerObject:(id)object {
   });
 }
 
+- (void)registerProxy:(id)proxy {
+  [FPRProxyObjectHelper registerProxyObject:proxy
+                                forProtocol:@protocol(NSURLSessionDelegate)
+                            varFoundHandler:^(id ivar) {
+                              [self registerClass:[ivar class]];
+                              [self registerObject:ivar];
+                            }];
+}
+
 @end
diff --git a/...Performance/Sources/Instrumentation/Network/Delegates/FPRNSURLSessionDelegateInstrument.m b/...Performance/Sources/Instrumentation/Network/Delegates/FPRNSURLSessionDelegateInstrument.m
@@ -18,6 +18,7 @@
 #import "FirebasePerformance/Sources/Instrumentation/FPRClassInstrumentor.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRInstrument_Private.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRNetworkTrace.h"
+#import "FirebasePerformance/Sources/Instrumentation/FPRProxyObjectHelper.h"
 #import "FirebasePerformance/Sources/Instrumentation/FPRSelectorInstrumentor.h"
 #import "FirebasePerformance/Sources/Instrumentation/Network/Delegates/FPRNSURLSessionDelegate.h"
 #import "FirebasePerformance/Sources/Instrumentation/Network/FPRNetworkInstrumentHelpers.h"
@@ -263,4 +264,13 @@ - (void)registerObject:(id)object {
   });
 }
 
+- (void)registerProxy:(id)proxy {
+  [FPRProxyObjectHelper registerProxyObject:proxy
+                                forProtocol:@protocol(NSURLSessionDelegate)
+                            varFoundHandler:^(id ivar) {
+                              [self registerClass:[ivar class]];
+                              [self registerObject:ivar];
+                            }];
+}
+
 @end
diff --git a/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLSessionInstrument.m b/FirebasePerformance/Sources/Instrumentation/Network/FPRNSURLSessionInstrument.m
@@ -157,9 +157,12 @@ void InstrumentSessionWithConfigurationDelegateDelegateQueue(
           ThrowExceptionBecauseInstrumentHasBeenDeallocated(selector, instrumentedClass);
         }
         if (delegate) {
-          [delegateInstrument registerClass:[delegate class]];
-          [delegateInstrument registerObject:delegate];
-
+          if ([delegate isProxy]) {
+            [delegateInstrument registerProxy:delegate];
+          } else {
+            [delegateInstrument registerClass:[delegate class]];
+            [delegateInstrument registerObject:delegate];
+          }
         } else {
           delegate = [[FPRNSURLSessionDelegate alloc] init];
         }

diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTest.m b/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTest.m
diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTestDelegates.h b/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTestDelegates.h
@@ -52,6 +52,12 @@ NS_ASSUME_NONNULL_BEGIN
 /** Set to YES when URLSession:dataTask:didReceiveData: is called, used for testing. */
 @property(nonatomic) BOOL URLSessionDataTaskDidReceiveDataCalled;
 
+/** Set to YES when
+ * URLSession:dataTask:didReceiveResponse:completionHandler: is called, used
+ * for testing.
+ */
+@property(nonatomic) BOOL URLSessionDataTaskDidReceiveResponseCompletionHandlerCalled;
+
 /** Set to YES when URLSession:downloadTask:didFinishDownloadingToURL: is called, used for testing.
  */
 @property(nonatomic) BOOL URLSessionDownloadTaskDidFinishDownloadingToURLCalled;

diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTestDelegates.m b/FirebasePerformance/Tests/Unit/Instruments/FPRNSURLSessionInstrumentTestDelegates.m
@@ -72,6 +72,14 @@ - (void)URLSession:(NSURLSession *)session
   self.URLSessionDataTaskDidReceiveDataCalled = YES;
 }
 
+- (void)URLSession:(NSURLSession *)session
+              dataTask:(NSURLSessionDataTask *)dataTask
+    didReceiveResponse:(NSURLResponse *)response
+     completionHandler:(void (^)(NSURLSessionResponseDisposition disposition))completionHandler {
+  self.URLSessionDataTaskDidReceiveResponseCompletionHandlerCalled = YES;
+  completionHandler(NSURLSessionResponseAllow);
+}
+
 #pragma mark - NSURLSessionDownloadDelegate methods
 
 - (void)URLSession:(NSURLSession *)session

diff --git a/FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m b/FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m

 @end

 @implementation ScreenTracesViewController

 - (instancetype)init {
  NSAssert(NO, @"Not a valid initializer.");
diff --git a/FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h b/FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h

 #import <Foundation/Foundation.h>

 typedef void (^SuccessNetworkCallback)();
 typedef void (^FailureNetworkCallback)(NSError *error);

 /** A protocol for network connection tasks. */
diff --git a/...rformance/Tests/TestApp/Source/Networking/PerfURLConnectionWithDelegateStartImmediately.m b/...rformance/Tests/TestApp/Source/Networking/PerfURLConnectionWithDelegateStartImmediately.m

  NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:self.urlString]];

  self.URLConnection = [[NSURLConnection alloc] initWithRequest:request
                                                       delegate:self
                                               startImmediately:YES];
 }
diff --git a/FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m b/FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m

 /** Tests that FPRAssert actually asserts (when NS_BLOCK_ASSERTIONS=0|undefined). */
 - (void)testFPRAssert {
  XCTAssertThrows(FPRAssert(NO, @"This is a failed assert!"));
 }

 /** Tests emit diagnostics methods. */
diff --git a/FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m b/FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m
 */
 - (void)testViewDidAppearInvokesViewControllerDidAppearOnScreenTraceTracker {
  UIViewController *testViewController = [[UIViewController alloc] init];
  [[UIApplication sharedApplication].keyWindow addSubview:[testViewController view]];

  FPRUIViewControllerInstrument *instrument = [[FPRUIViewControllerInstrument alloc] init];
  [instrument registerInstrumentors];
diff --git a/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m b/FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m
                                forKey:@"fpr_vc_session_sampling_rate"];

  // Trigger the RC config fetch
  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
  remoteConfig.lastFetchTime = nil;
  configFlags.appStartConfigFetchDelayInSeconds = 0.0;
  [configFlags update];
                                forKey:@"fpr_vc_session_sampling_rate"];

  // Retrigger the RC config fetch
  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
  remoteConfig.lastFetchTime = nil;
  [configFlags update];


  FPRRemoteConfigFlags *configFlags =
      [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
  configFlags.appStartConfigFetchDelayInSeconds = 0.0;
  [configFlags update];
  XCTAssertNotNil(configFlags.lastFetchedTime);
  FPRRemoteConfigFlags *configFlags =
      [[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];

  remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
  configFlags.appStartConfigFetchDelayInSeconds = 0.0;
  [configFlags update];
  XCTAssertNotNil(configFlags.lastFetchedTime);

	@end

	@implementation ScreenTracesViewController
Check warning on line 22 in FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m GitHub Actions / performance (iOS, proddev) `method override for the designated initializer of the superclass '-initWithStyle:' not found [-Wobjc-designated-initializers]` Check warning on line 22 in FirebasePerformance/Tests/TestApp/Source/ViewControllers/ScreenTracesViewController.m GitHub Actions / performance (tvOS, proddev) `method override for the designated initializer of the superclass '-initWithStyle:' not found [-Wobjc-designated-initializers]`

	- (instancetype)init {
	NSAssert(NO, @"Not a valid initializer.");

	#import <Foundation/Foundation.h>

	typedef void (^SuccessNetworkCallback)();
Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (iOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (iOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (iOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (iOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (iOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (tvOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (tvOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (tvOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (tvOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]` Check warning on line 17 in FirebasePerformance/Tests/TestApp/Source/Networking/NetworkConnection.h GitHub Actions / performance (tvOS, proddev) `a block declaration without a prototype is deprecated [-Wstrict-prototypes]`
	typedef void (^FailureNetworkCallback)(NSError *error);

	/** A protocol for network connection tasks. */

	NSURLRequest *request = [[NSURLRequest alloc] initWithURL:[NSURL URLWithString:self.urlString]];

	self.URLConnection = [[NSURLConnection alloc] initWithRequest:request
Check warning on line 42 in FirebasePerformance/Tests/TestApp/Source/Networking/PerfURLConnectionWithDelegateStartImmediately.m GitHub Actions / performance (iOS, proddev) `'initWithRequest:delegate:startImmediately:' is deprecated: first deprecated in iOS 9.0 - Use NSURLSession (see NSURLSession.h) [-Wdeprecated-declarations]`
	delegate:self
	startImmediately:YES];
	}

	/** Tests that FPRAssert actually asserts (when NS_BLOCK_ASSERTIONS=0\|undefined). */
	- (void)testFPRAssert {
	XCTAssertThrows(FPRAssert(NO, @"This is a failed assert!"));
Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-15, Xcode_16.2, tvOS) `'(' and '{' tokens introducing statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-15, Xcode_16.2, tvOS) `'}' and ')' tokens terminating statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-15, Xcode_16.2, iOS) `'(' and '{' tokens introducing statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-15, Xcode_16.2, iOS) `'}' and ')' tokens terminating statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-14, Xcode_15.4, iOS) `'(' and '{' tokens introducing statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-14, Xcode_15.4, iOS) `'}' and ')' tokens terminating statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-13, Xcode_15.2, iOS) `'(' and '{' tokens introducing statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]` Check warning on line 83 in FirebasePerformance/Tests/Unit/Common/FPRDiagnosticsTest.m GitHub Actions / spm (macos-13, Xcode_15.2, iOS) `'}' and ')' tokens terminating statement expression appear in different macro expansion contexts [-Wcompound-token-split-by-macro]`
	}

	/** Tests emit diagnostics methods. */
	*/
	- (void)testViewDidAppearInvokesViewControllerDidAppearOnScreenTraceTracker {
	UIViewController *testViewController = [[UIViewController alloc] init];
	[[UIApplication sharedApplication].keyWindow addSubview:[testViewController view]];
Check warning on line 62 in FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m GitHub Actions / performance (tvOS, unit) `'keyWindow' is deprecated: first deprecated in tvOS 13.0 - Should not be used for applications that support multiple scenes as it returns a key window across all connected scenes [-Wdeprecated-declarations]` Check warning on line 62 in FirebasePerformance/Tests/Unit/Instruments/FPRUIViewControllerInstrumentTest.m GitHub Actions / performance (iOS, unit) `'keyWindow' is deprecated: first deprecated in iOS 13.0 - Should not be used for applications that support multiple scenes as it returns a key window across all connected scenes [-Wdeprecated-declarations]`

	FPRUIViewControllerInstrument *instrument = [[FPRUIViewControllerInstrument alloc] init];
	[instrument registerInstrumentors];
	forKey:@"fpr_vc_session_sampling_rate"];

	// Trigger the RC config fetch
	remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
Check warning on line 68 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (tvOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]` Check warning on line 68 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (iOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]`
	remoteConfig.lastFetchTime = nil;
	configFlags.appStartConfigFetchDelayInSeconds = 0.0;
	[configFlags update];
	forKey:@"fpr_vc_session_sampling_rate"];

	// Retrigger the RC config fetch
	remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
Check warning on line 95 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (tvOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]` Check warning on line 95 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (iOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]`
	remoteConfig.lastFetchTime = nil;
	[configFlags update];


	FPRRemoteConfigFlags *configFlags =
	[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];
	remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
Check warning on line 115 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (tvOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]` Check warning on line 115 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (iOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]`
	configFlags.appStartConfigFetchDelayInSeconds = 0.0;
	[configFlags update];
	XCTAssertNotNil(configFlags.lastFetchedTime);
	FPRRemoteConfigFlags *configFlags =
	[[FPRRemoteConfigFlags alloc] initWithRemoteConfig:(FIRRemoteConfig *)remoteConfig];

	remoteConfig.fetchStatus = FIRRemoteConfigFetchStatusSuccess;
Check warning on line 182 in FirebasePerformance/Tests/Unit/Configurations/FPRRemoteConfigFlagsTest.m GitHub Actions / performance (tvOS, unit) `implicit conversion from enumeration type 'enum FIRRemoteConfigFetchStatus' to different enumeration type 'FIRRemoteConfigFetchAndActivateStatus' (aka 'enum FIRRemoteConfigFetchAndActivateStatus') [-Wenum-conversion]`
	configFlags.appStartConfigFetchDelayInSeconds = 0.0;
	[configFlags update];
	XCTAssertNotNil(configFlags.lastFetchedTime);