Add product_id to GoogleDataTransport logging for compliance. (#12143)

Author: leojaygoogle

FirebaseMessaging.podspec

@@ -64,7 +64,7 @@ device, and it is completely free.
   s.dependency 'GoogleUtilities/Reachability', '~> 7.8'
   s.dependency 'GoogleUtilities/Environment', '~> 7.8'
   s.dependency 'GoogleUtilities/UserDefaults', '~> 7.8'
-  s.dependency 'GoogleDataTransport', '~> 9.2'
+  s.dependency 'GoogleDataTransport', '~> 9.3'
   s.dependency 'nanopb', '>= 2.30908.0', '< 2.30910.0'
 
   s.test_spec 'unit' do |unit_tests|

FirebaseMessaging/Sources/FIRMessagingConstants.h

@@ -33,6 +33,7 @@ FOUNDATION_EXPORT NSString *const kFIRMessagingFID;
 FOUNDATION_EXPORT NSString *const kFIRMessagingAnalyticsComposerIdentifier;
 FOUNDATION_EXPORT NSString *const kFIRMessagingAnalyticsMessageLabel;
 FOUNDATION_EXPORT NSString *const kFIRMessagingAnalyticsComposerLabel;
+FOUNDATION_EXPORT NSString *const kFIRMessagingProductID;
 
 FOUNDATION_EXPORT NSString *const kFIRMessagingRemoteNotificationsProxyEnabledInfoPlistKey;
 FOUNDATION_EXPORT NSString *const kFIRMessagingSubDirectoryName;

FirebaseMessaging/Sources/FIRMessagingConstants.m

@@ -43,6 +43,7 @@
 NSString *const kFIRMessagingAnalyticsComposerIdentifier = @"google.c.a.c_id";
 NSString *const kFIRMessagingAnalyticsMessageLabel = @"google.c.a.m_l";
 NSString *const kFIRMessagingAnalyticsComposerLabel = @"google.c.a.c_l";
+NSString *const kFIRMessagingProductID = @"google.product_id";
 
 NSString *const kFIRMessagingRemoteNotificationsProxyEnabledInfoPlistKey =
     @"FirebaseAppDelegateProxyEnabled";

FirebaseMessaging/Sources/FIRMessagingExtensionHelper.m

@@ -266,7 +266,14 @@ - (void)exportDeliveryMetricsToBigQueryWithMessageInfo:(NSDictionary *)info {
   FIRMessagingMetricsLog *log =
       [[FIRMessagingMetricsLog alloc] initWithEventExtension:eventExtension];
 
-  GDTCOREvent *event = [transport eventForTransport];
+  GDTCOREvent *event;
+  if (info[kFIRMessagingProductID]) {
+    int32_t productID = [info[kFIRMessagingProductID] intValue];
+    GDTCORProductData *productData = [[GDTCORProductData alloc] initWithProductID:productID];
+    event = [transport eventForTransportWithProductData:productData];
+  } else {
+    event = [transport eventForTransport];
+  }
   event.dataObject = log;
   event.qosTier = GDTCOREventQoSFast;
 

Package.swift

@@ -150,7 +150,7 @@ let package = Package(
     googleAppMeasurementDependency(),
     .package(
       url: "https://github.com/google/GoogleDataTransport.git",
-      "9.2.0" ..< "10.0.0"
+      "9.3.0" ..< "10.0.0"
     ),
     .package(
       url: "https://github.com/google/GoogleUtilities.git",