feat!: remove WebDataStream, IosAppDataStream, AndroidAppDataStream resources (#187)

* feat!: remove `WebDataStream`, `IosAppDataStream`, `AndroidAppDataStream` resources
and corresponding operations, as they are replaced by the `DataStream` resource
feat: add `restricted_metric_type` field to the `CustomMetric` resource
feat!: move the `GlobalSiteTag` resource from the property level to the data stream level

PiperOrigin-RevId: 432342398

Source-Link: googleapis/googleapis@a079cb0

Source-Link: googleapis/googleapis-gen@2f29c5a
Copy-Tag: eyJwIjoiLmdpdGh1Yi8uT3dsQm90LnlhbWwiLCJoIjoiMmYyOWM1YWYzMDU0YTZlMzhkZjIxNThmMDliNzZlYzJmYWZkMGIyZiJ9

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

* 🦉 Updates from OwlBot post-processor

See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md

Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>

Author: gcf-owl-bot[bot]

packages/google-analytics-admin/protos/google/analytics/admin/v1alpha/analytics_admin.proto

@@ -1,4 +1,4 @@
-// Copyright 2021 Google LLC
+// Copyright 2022 Google LLC
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -164,15 +164,6 @@ enum ChangeHistoryResourceType {
   // Property resource
   PROPERTY = 2;
 
-  // WebDataStream resource
-  WEB_DATA_STREAM = 3;
-
-  // AndroidAppDataStream resource
-  ANDROID_APP_DATA_STREAM = 4;
-
-  // IosAppDataStream resource
-  IOS_APP_DATA_STREAM = 5;
-
   // FirebaseLink resource
   FIREBASE_LINK = 6;
 
@@ -202,6 +193,9 @@ enum ChangeHistoryResourceType {
 
   // DisplayVideo360AdvertiserLinkProposal resource
   DISPLAY_VIDEO_360_ADVERTISER_LINK_PROPOSAL = 15;
+
+  // DataStream resource
+  DATA_STREAM = 18;
 }
 
 // Status of the Google Signals settings (i.e., whether this feature has been
@@ -382,109 +376,6 @@ message Property {
   ];
 }
 
-// A resource message representing a Google Analytics Android app stream.
-message AndroidAppDataStream {
-  option (google.api.resource) = {
-    type: "analyticsadmin.googleapis.com/AndroidAppDataStream"
-    pattern: "properties/{property}/androidAppDataStreams/{android_app_data_stream}"
-  };
-
-  // Output only. Resource name of this Data Stream.
-  // Format: properties/{property_id}/androidAppDataStreams/{stream_id}
-  // Example: "properties/1000/androidAppDataStreams/2000"
-  string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. ID of the corresponding Android app in Firebase, if any.
-  // This ID can change if the Android app is deleted and recreated.
-  string firebase_app_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when this stream was originally created.
-  google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when stream payload fields were last updated.
-  google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Immutable. The package name for the app being measured.
-  // Example: "com.example.myandroidapp"
-  string package_name = 5 [(google.api.field_behavior) = IMMUTABLE];
-
-  // Human-readable display name for the Data Stream.
-  //
-  // The max allowed display name length is 255 UTF-16 code units.
-  string display_name = 6;
-}
-
-// A resource message representing a Google Analytics IOS app stream.
-message IosAppDataStream {
-  option (google.api.resource) = {
-    type: "analyticsadmin.googleapis.com/IosAppDataStream"
-    pattern: "properties/{property}/iosAppDataStreams/{ios_app_data_stream}"
-  };
-
-  // Output only. Resource name of this Data Stream.
-  // Format: properties/{property_id}/iosAppDataStreams/{stream_id}
-  // Example: "properties/1000/iosAppDataStreams/2000"
-  string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. ID of the corresponding iOS app in Firebase, if any.
-  // This ID can change if the iOS app is deleted and recreated.
-  string firebase_app_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when this stream was originally created.
-  google.protobuf.Timestamp create_time = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when stream payload fields were last updated.
-  google.protobuf.Timestamp update_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Required. Immutable. The Apple App Store Bundle ID for the app
-  // Example: "com.example.myiosapp"
-  string bundle_id = 5 [
-    (google.api.field_behavior) = IMMUTABLE,
-    (google.api.field_behavior) = REQUIRED
-  ];
-
-  // Human-readable display name for the Data Stream.
-  //
-  // The max allowed display name length is 255 UTF-16 code units.
-  string display_name = 6;
-}
-
-// A resource message representing a Google Analytics web stream.
-message WebDataStream {
-  option (google.api.resource) = {
-    type: "analyticsadmin.googleapis.com/WebDataStream"
-    pattern: "properties/{property}/webDataStreams/{web_data_stream}"
-  };
-
-  // Output only. Resource name of this Data Stream.
-  // Format: properties/{property_id}/webDataStreams/{stream_id}
-  // Example: "properties/1000/webDataStreams/2000"
-  string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Analytics "Measurement ID", without the "G-" prefix.
-  // Example: "G-1A2BCD345E" would just be "1A2BCD345E"
-  string measurement_id = 2 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. ID of the corresponding web app in Firebase, if any.
-  // This ID can change if the web app is deleted and recreated.
-  string firebase_app_id = 3 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when this stream was originally created.
-  google.protobuf.Timestamp create_time = 4 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Output only. Time when stream payload fields were last updated.
-  google.protobuf.Timestamp update_time = 5 [(google.api.field_behavior) = OUTPUT_ONLY];
-
-  // Immutable. Domain name of the web app being measured, or empty.
-  // Example: "http://www.google.com", "https://www.google.com"
-  string default_uri = 6 [(google.api.field_behavior) = IMMUTABLE];
-
-  // Required. Human-readable display name for the Data Stream.
-  //
-  // The max allowed display name length is 255 UTF-16 code units.
-  string display_name = 7 [(google.api.field_behavior) = REQUIRED];
-}
-
 // A resource message representing a data stream.
 message DataStream {
   option (google.api.resource) = {
@@ -668,15 +559,16 @@ message FirebaseLink {
 }
 
 // Read-only resource with the tag for sending data from a website to a
-// WebDataStream.
+// DataStream. Only present for web DataStream resources.
 message GlobalSiteTag {
   option (google.api.resource) = {
     type: "analyticsadmin.googleapis.com/GlobalSiteTag"
-    pattern: "properties/{property}/globalSiteTag"
+    pattern: "properties/{property}/dataStreams/{data_stream}/globalSiteTag"
   };
 
   // Output only. Resource name for this GlobalSiteTag resource.
-  // Format: properties/{propertyId}/globalSiteTag
+  // Format: properties/{property_id}/dataStreams/{stream_id}/globalSiteTag
+  // Example: "properties/123/dataStreams/456/globalSiteTag"
   string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
 
   // Immutable. JavaScript code snippet to be pasted as the first item into the head tag of
@@ -796,7 +688,7 @@ message PropertySummary {
 message MeasurementProtocolSecret {
   option (google.api.resource) = {
     type: "analyticsadmin.googleapis.com/MeasurementProtocolSecret"
-    pattern: "properties/{property}/webDataStreams/{web_data_stream}/measurementProtocolSecrets/{measurement_protocol_secret}"
+    pattern: "properties/{property}/dataStreams/{data_stream}/measurementProtocolSecrets/{measurement_protocol_secret}"
   };
 
   // Output only. Resource name of this secret. This secret may be a child of any type of
@@ -854,15 +746,6 @@ message ChangeHistoryChange {
       // A snapshot of a Property resource in change history.
       Property property = 2;
 
-      // A snapshot of a WebDataStream resource in change history.
-      WebDataStream web_data_stream = 3;
-
-      // A snapshot of an AndroidAppDataStream resource in change history.
-      AndroidAppDataStream android_app_data_stream = 4;
-
-      // A snapshot of an IosAppDataStream resource in change history.
-      IosAppDataStream ios_app_data_stream = 5;
-
       // A snapshot of a FirebaseLink resource in change history.
       FirebaseLink firebase_link = 6;
 
@@ -894,6 +777,9 @@ message ChangeHistoryChange {
 
       // A snapshot of a data retention settings resource in change history.
       DataRetentionSettings data_retention_settings = 15;
+
+      // A snapshot of a DataStream resource in change history.
+      DataStream data_stream = 18;
     }
   }
 
@@ -1176,6 +1062,19 @@ message CustomMetric {
     EVENT = 1;
   }
 
+  // Labels that mark the data in this custom metric as data that should be
+  // restricted to specific users.
+  enum RestrictedMetricType {
+    // Type unknown or unspecified.
+    RESTRICTED_METRIC_TYPE_UNSPECIFIED = 0;
+
+    // Metric reports cost data.
+    COST_DATA = 1;
+
+    // Metric reports revenue data.
+    REVENUE_DATA = 2;
+  }
+
   // Output only. Resource name for this CustomMetric resource.
   // Format: properties/{property}/customMetrics/{customMetric}
   string name = 1 [(google.api.field_behavior) = OUTPUT_ONLY];
@@ -1211,6 +1110,11 @@ message CustomMetric {
     (google.api.field_behavior) = REQUIRED,
     (google.api.field_behavior) = IMMUTABLE
   ];
+
+  // Optional. Types of restricted data that this metric may contain. Required for metrics
+  // with CURRENCY measurement unit. Must be empty for metrics with a
+  // non-CURRENCY measurement unit.
+  repeated RestrictedMetricType restricted_metric_type = 8 [(google.api.field_behavior) = OPTIONAL];
 }
 
 // Settings values for data retention. This is a singleton resource.