fix!: [analyticsadmin] update the ReportingAttributionModel enum to…

… rename `CROSS_CHANNEL_DATA_DRIVEN` to `PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN`, `CROSS_CHANNEL_LAST_CLICK` to `PAID_AND_ORGANIC_CHANNELS_LAST_CLICK`, `CROSS_CHANNEL_FIRST_CLICK` to `P... (#9706)

* fix!: update the `ReportingAttributionModel` enum to rename `CROSS_CHANNEL_DATA_DRIVEN` to `PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN`, `CROSS_CHANNEL_LAST_CLICK` to `PAID_AND_ORGANIC_CHANNELS_LAST_CLICK`, `CROSS_CHANNEL_FIRST_CLICK` to `PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK`, `CROSS_CHANNEL_LINEAR` to `PAID_AND_ORGANIC_CHANNELS_LINEAR`, `CROSS_CHANNEL_POSITION_BASED` to `PAID_AND_ORGANIC_CHANNELS_POSITION_BASED` `CROSS_CHANNEL_TIME_DECAY` to `PAID_AND_ORGANIC_CHANNELS_TIME_DECAY`, `ADS_PREFERRED_LAST_CLICK` to `GOOGLE_PAID_CHANNELS_LAST_CLICK`

fix!: update the `AdsWebConversionDataExportScope` enum to rename `CROSS_CHANNEL` to `PAID_AND_ORGANIC_CHANNELS`, `ADS_PREFERRED` to `GOOGLE_PAID_CHANNELS`

PiperOrigin-RevId: 551280325

Source-Link: googleapis/googleapis@0d84384

Source-Link: https://github.com/googleapis/googleapis-gen/commit/da9de65834a4b6b7ec4586220500e8cefeb5efd3
Copy-Tag: eyJwIjoiamF2YS1hbmFseXRpY3MtYWRtaW4vLk93bEJvdC55YW1sIiwiaCI6ImRhOWRlNjU4MzRhNGI2YjdlYzQ1ODYyMjA1MDBlOGNlZmViNWVmZDMifQ==

* 🦉 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>

java-analytics-admin/README.md

@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
 [kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
 [stability-image]: https://img.shields.io/badge/stability-preview-yellow
 [maven-version-image]: https://img.shields.io/maven-central/v/com.google.analytics/google-analytics-admin.svg
-[maven-version-link]: https://central.sonatype.com/artifact/com.google.analytics/google-analytics-admin/0.31.0
+[maven-version-link]: https://central.sonatype.com/artifact/com.google.analytics/google-analytics-admin/0.32.0
 [authentication]: https://github.com/googleapis/google-cloud-java#authentication
 [auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
 [predefined-iam-roles]: https://cloud.google.com/iam/docs/understanding-roles#predefined_roles

java-analytics-admin/google-analytics-admin/src/main/java/com/google/analytics/admin/v1alpha/AnalyticsAdminServiceClient.java

@@ -4240,7 +4240,8 @@ public final void deleteMeasurementProtocolSecret(
    * }</pre>
    *
    * @param measurementProtocolSecret Required. The measurement protocol secret to update.
-   * @param updateMask The list of fields to be updated. Omitted fields will not be updated.
+   * @param updateMask Required. The list of fields to be updated. Omitted fields will not be
+   *     updated.
    * @throws com.google.api.gax.rpc.ApiException if the remote call fails
    */
   public final MeasurementProtocolSecret updateMeasurementProtocolSecret(

java-analytics-admin/proto-google-analytics-admin-v1alpha/src/main/java/com/google/analytics/admin/v1alpha/AttributionSettings.java

@@ -453,107 +453,114 @@ public enum ReportingAttributionModel implements com.google.protobuf.ProtocolMes
      * Data-driven attribution distributes credit for the conversion based on
      * data for each conversion event. Each Data-driven model is specific to
      * each advertiser and each conversion event.
+     * Previously CROSS_CHANNEL_DATA_DRIVEN
      * </pre>
      *
-     * <code>CROSS_CHANNEL_DATA_DRIVEN = 1;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1;</code>
      */
-    CROSS_CHANNEL_DATA_DRIVEN(1),
+    PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN(1),
     /**
      *
      *
      * <pre>
      * Ignores direct traffic and attributes 100% of the conversion value to the
      * last channel that the customer clicked through (or engaged view through
      * for YouTube) before converting.
+     * Previously CROSS_CHANNEL_LAST_CLICK
      * </pre>
      *
-     * <code>CROSS_CHANNEL_LAST_CLICK = 2;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2;</code>
      */
-    CROSS_CHANNEL_LAST_CLICK(2),
+    PAID_AND_ORGANIC_CHANNELS_LAST_CLICK(2),
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Gives all credit for the conversion to the first channel that a customer
      * clicked (or engaged view through for YouTube) before converting.
+     * Previously CROSS_CHANNEL_FIRST_CLICK
      * </pre>
      *
-     * <code>CROSS_CHANNEL_FIRST_CLICK = 3;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK = 3;</code>
      */
-    CROSS_CHANNEL_FIRST_CLICK(3),
+    PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK(3),
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Distributes the credit for the conversion equally across all the channels
      * a customer clicked (or engaged view through for YouTube) before
      * converting.
+     * Previously CROSS_CHANNEL_LINEAR
      * </pre>
      *
-     * <code>CROSS_CHANNEL_LINEAR = 4;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_LINEAR = 4;</code>
      */
-    CROSS_CHANNEL_LINEAR(4),
+    PAID_AND_ORGANIC_CHANNELS_LINEAR(4),
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Attributes 40% credit to the first and last interaction, and the
      * remaining 20% credit is distributed evenly to the middle interactions.
+     * Previously CROSS_CHANNEL_POSITION_BASED
      * </pre>
      *
-     * <code>CROSS_CHANNEL_POSITION_BASED = 5;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_POSITION_BASED = 5;</code>
      */
-    CROSS_CHANNEL_POSITION_BASED(5),
+    PAID_AND_ORGANIC_CHANNELS_POSITION_BASED(5),
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Gives more credit to the touchpoints that happened closer in time to
      * the conversion.
+     * Previously CROSS_CHANNEL_TIME_DECAY
      * </pre>
      *
-     * <code>CROSS_CHANNEL_TIME_DECAY = 6;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_TIME_DECAY = 6;</code>
      */
-    CROSS_CHANNEL_TIME_DECAY(6),
+    PAID_AND_ORGANIC_CHANNELS_TIME_DECAY(6),
     /**
      *
      *
      * <pre>
-     * Attributes 100% of the conversion value to the last Google Ads channel
+     * Attributes 100% of the conversion value to the last Google Paid channel
      * that the customer clicked through before converting.
+     * Previously ADS_PREFERRED_LAST_CLICK
      * </pre>
      *
-     * <code>ADS_PREFERRED_LAST_CLICK = 7;</code>
+     * <code>GOOGLE_PAID_CHANNELS_LAST_CLICK = 7;</code>
      */
-    ADS_PREFERRED_LAST_CLICK(7),
+    GOOGLE_PAID_CHANNELS_LAST_CLICK(7),
     UNRECOGNIZED(-1),
     ;
 
@@ -574,107 +581,114 @@ public enum ReportingAttributionModel implements com.google.protobuf.ProtocolMes
      * Data-driven attribution distributes credit for the conversion based on
      * data for each conversion event. Each Data-driven model is specific to
      * each advertiser and each conversion event.
+     * Previously CROSS_CHANNEL_DATA_DRIVEN
      * </pre>
      *
-     * <code>CROSS_CHANNEL_DATA_DRIVEN = 1;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1;</code>
      */
-    public static final int CROSS_CHANNEL_DATA_DRIVEN_VALUE = 1;
+    public static final int PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN_VALUE = 1;
     /**
      *
      *
      * <pre>
      * Ignores direct traffic and attributes 100% of the conversion value to the
      * last channel that the customer clicked through (or engaged view through
      * for YouTube) before converting.
+     * Previously CROSS_CHANNEL_LAST_CLICK
      * </pre>
      *
-     * <code>CROSS_CHANNEL_LAST_CLICK = 2;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2;</code>
      */
-    public static final int CROSS_CHANNEL_LAST_CLICK_VALUE = 2;
+    public static final int PAID_AND_ORGANIC_CHANNELS_LAST_CLICK_VALUE = 2;
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Gives all credit for the conversion to the first channel that a customer
      * clicked (or engaged view through for YouTube) before converting.
+     * Previously CROSS_CHANNEL_FIRST_CLICK
      * </pre>
      *
-     * <code>CROSS_CHANNEL_FIRST_CLICK = 3;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK = 3;</code>
      */
-    public static final int CROSS_CHANNEL_FIRST_CLICK_VALUE = 3;
+    public static final int PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK_VALUE = 3;
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Distributes the credit for the conversion equally across all the channels
      * a customer clicked (or engaged view through for YouTube) before
      * converting.
+     * Previously CROSS_CHANNEL_LINEAR
      * </pre>
      *
-     * <code>CROSS_CHANNEL_LINEAR = 4;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_LINEAR = 4;</code>
      */
-    public static final int CROSS_CHANNEL_LINEAR_VALUE = 4;
+    public static final int PAID_AND_ORGANIC_CHANNELS_LINEAR_VALUE = 4;
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Attributes 40% credit to the first and last interaction, and the
      * remaining 20% credit is distributed evenly to the middle interactions.
+     * Previously CROSS_CHANNEL_POSITION_BASED
      * </pre>
      *
-     * <code>CROSS_CHANNEL_POSITION_BASED = 5;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_POSITION_BASED = 5;</code>
      */
-    public static final int CROSS_CHANNEL_POSITION_BASED_VALUE = 5;
+    public static final int PAID_AND_ORGANIC_CHANNELS_POSITION_BASED_VALUE = 5;
     /**
      *
      *
      * <pre>
      * Starting in June 2023, new properties can no longer use this model.
      * See
      * [Analytics
-     * Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
+     * Help](https://support.google.com/analytics/answer/9164320#040623)
      * for more details.
      * Starting in September 2023, we will sunset this model for all properties.
      *
      * Gives more credit to the touchpoints that happened closer in time to
      * the conversion.
+     * Previously CROSS_CHANNEL_TIME_DECAY
      * </pre>
      *
-     * <code>CROSS_CHANNEL_TIME_DECAY = 6;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS_TIME_DECAY = 6;</code>
      */
-    public static final int CROSS_CHANNEL_TIME_DECAY_VALUE = 6;
+    public static final int PAID_AND_ORGANIC_CHANNELS_TIME_DECAY_VALUE = 6;
     /**
      *
      *
      * <pre>
-     * Attributes 100% of the conversion value to the last Google Ads channel
+     * Attributes 100% of the conversion value to the last Google Paid channel
      * that the customer clicked through before converting.
+     * Previously ADS_PREFERRED_LAST_CLICK
      * </pre>
      *
-     * <code>ADS_PREFERRED_LAST_CLICK = 7;</code>
+     * <code>GOOGLE_PAID_CHANNELS_LAST_CLICK = 7;</code>
      */
-    public static final int ADS_PREFERRED_LAST_CLICK_VALUE = 7;
+    public static final int GOOGLE_PAID_CHANNELS_LAST_CLICK_VALUE = 7;
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
@@ -703,19 +717,19 @@ public static ReportingAttributionModel forNumber(int value) {
         case 0:
           return REPORTING_ATTRIBUTION_MODEL_UNSPECIFIED;
         case 1:
-          return CROSS_CHANNEL_DATA_DRIVEN;
+          return PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN;
         case 2:
-          return CROSS_CHANNEL_LAST_CLICK;
+          return PAID_AND_ORGANIC_CHANNELS_LAST_CLICK;
         case 3:
-          return CROSS_CHANNEL_FIRST_CLICK;
+          return PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK;
         case 4:
-          return CROSS_CHANNEL_LINEAR;
+          return PAID_AND_ORGANIC_CHANNELS_LINEAR;
         case 5:
-          return CROSS_CHANNEL_POSITION_BASED;
+          return PAID_AND_ORGANIC_CHANNELS_POSITION_BASED;
         case 6:
-          return CROSS_CHANNEL_TIME_DECAY;
+          return PAID_AND_ORGANIC_CHANNELS_TIME_DECAY;
         case 7:
-          return ADS_PREFERRED_LAST_CLICK;
+          return GOOGLE_PAID_CHANNELS_LAST_CLICK;
         default:
           return null;
       }
@@ -810,22 +824,27 @@ public enum AdsWebConversionDataExportScope implements com.google.protobuf.Proto
      *
      *
      * <pre>
-     * The Ads Web Conversion Data export scope is Cross Channel.
+     * Paid and organic channels are eligible to receive conversion credit, but
+     * only credit assigned to Google Ads channels will appear in your Ads
+     * accounts. To learn more, see [Paid and Organic
+     * channels](https://support.google.com/analytics/answer/10632359).
      * </pre>
      *
-     * <code>CROSS_CHANNEL = 2;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS = 2;</code>
      */
-    CROSS_CHANNEL(2),
+    PAID_AND_ORGANIC_CHANNELS(2),
     /**
      *
      *
      * <pre>
-     * The Ads Web Conversion Data export scope is Ads Preferred.
+     * Only Google Ads paid channels are eligible to receive conversion credit.
+     * To learn more, see [Google Paid
+     * channels](https://support.google.com/analytics/answer/10632359).
      * </pre>
      *
-     * <code>ADS_PREFERRED = 3;</code>
+     * <code>GOOGLE_PAID_CHANNELS = 3;</code>
      */
-    ADS_PREFERRED(3),
+    GOOGLE_PAID_CHANNELS(3),
     UNRECOGNIZED(-1),
     ;
 
@@ -854,22 +873,27 @@ public enum AdsWebConversionDataExportScope implements com.google.protobuf.Proto
      *
      *
      * <pre>
-     * The Ads Web Conversion Data export scope is Cross Channel.
+     * Paid and organic channels are eligible to receive conversion credit, but
+     * only credit assigned to Google Ads channels will appear in your Ads
+     * accounts. To learn more, see [Paid and Organic
+     * channels](https://support.google.com/analytics/answer/10632359).
      * </pre>
      *
-     * <code>CROSS_CHANNEL = 2;</code>
+     * <code>PAID_AND_ORGANIC_CHANNELS = 2;</code>
      */
-    public static final int CROSS_CHANNEL_VALUE = 2;
+    public static final int PAID_AND_ORGANIC_CHANNELS_VALUE = 2;
     /**
      *
      *
      * <pre>
-     * The Ads Web Conversion Data export scope is Ads Preferred.
+     * Only Google Ads paid channels are eligible to receive conversion credit.
+     * To learn more, see [Google Paid
+     * channels](https://support.google.com/analytics/answer/10632359).
      * </pre>
      *
-     * <code>ADS_PREFERRED = 3;</code>
+     * <code>GOOGLE_PAID_CHANNELS = 3;</code>
      */
-    public static final int ADS_PREFERRED_VALUE = 3;
+    public static final int GOOGLE_PAID_CHANNELS_VALUE = 3;
 
     public final int getNumber() {
       if (this == UNRECOGNIZED) {
@@ -900,9 +924,9 @@ public static AdsWebConversionDataExportScope forNumber(int value) {
         case 1:
           return NOT_SELECTED_YET;
         case 2:
-          return CROSS_CHANNEL;
+          return PAID_AND_ORGANIC_CHANNELS;
         case 3:
-          return ADS_PREFERRED;
+          return GOOGLE_PAID_CHANNELS;
         default:
           return null;
       }