Add a unit test to verify behavior w/ URLSession:dataTask:didReceiveResponse:completionHandler:

.ruby-version

@@ -1 +1 @@
-ruby-2.7
+2.7.4

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

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

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

FirebasePerformance/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

FirebasePerformance/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

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];
         }