Skip to content

Commit f62e341

Browse files
gcf-owl-bot[bot]gcf-owl-bot[bot]
authored
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>
1 parent 46dcfbe commit f62e341

File tree

9 files changed

+1345
-1273
lines changed

9 files changed

+1345
-1273
lines changed

‎java-analytics-admin/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ Java is a registered trademark of Oracle and/or its affiliates.
201201
[kokoro-badge-link-5]: http://storage.googleapis.com/cloud-devrel-public/java/badges/google-cloud-java/java11.html
202202
[stability-image]: https://img.shields.io/badge/stability-preview-yellow
203203
[maven-version-image]: https://img.shields.io/maven-central/v/com.google.analytics/google-analytics-admin.svg
204-
[maven-version-link]: https://central.sonatype.com/artifact/com.google.analytics/google-analytics-admin/0.31.0
204+
[maven-version-link]: https://central.sonatype.com/artifact/com.google.analytics/google-analytics-admin/0.32.0
205205
[authentication]: https://github.com/googleapis/google-cloud-java#authentication
206206
[auth-scopes]: https://developers.google.com/identity/protocols/oauth2/scopes
207207
[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‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4240,7 +4240,8 @@ public final void deleteMeasurementProtocolSecret(
42404240
* }</pre>
42414241
*
42424242
* @param measurementProtocolSecret Required. The measurement protocol secret to update.
4243-
* @param updateMask The list of fields to be updated. Omitted fields will not be updated.
4243+
* @param updateMask Required. The list of fields to be updated. Omitted fields will not be
4244+
* updated.
42444245
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
42454246
*/
42464247
public final MeasurementProtocolSecret updateMeasurementProtocolSecret(

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

Lines changed: 1058 additions & 1058 deletions
Large diffs are not rendered by default.

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

Lines changed: 83 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -453,107 +453,114 @@ public enum ReportingAttributionModel implements com.google.protobuf.ProtocolMes
453453
* Data-driven attribution distributes credit for the conversion based on
454454
* data for each conversion event. Each Data-driven model is specific to
455455
* each advertiser and each conversion event.
456+
* Previously CROSS_CHANNEL_DATA_DRIVEN
456457
* </pre>
457458
*
458-
* <code>CROSS_CHANNEL_DATA_DRIVEN = 1;</code>
459+
* <code>PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1;</code>
459460
*/
460-
CROSS_CHANNEL_DATA_DRIVEN(1),
461+
PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN(1),
461462
/**
462463
*
463464
*
464465
* <pre>
465466
* Ignores direct traffic and attributes 100% of the conversion value to the
466467
* last channel that the customer clicked through (or engaged view through
467468
* for YouTube) before converting.
469+
* Previously CROSS_CHANNEL_LAST_CLICK
468470
* </pre>
469471
*
470-
* <code>CROSS_CHANNEL_LAST_CLICK = 2;</code>
472+
* <code>PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2;</code>
471473
*/
472-
CROSS_CHANNEL_LAST_CLICK(2),
474+
PAID_AND_ORGANIC_CHANNELS_LAST_CLICK(2),
473475
/**
474476
*
475477
*
476478
* <pre>
477479
* Starting in June 2023, new properties can no longer use this model.
478480
* See
479481
* [Analytics
480-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
482+
* Help](https://support.google.com/analytics/answer/9164320#040623)
481483
* for more details.
482484
* Starting in September 2023, we will sunset this model for all properties.
483485
*
484486
* Gives all credit for the conversion to the first channel that a customer
485487
* clicked (or engaged view through for YouTube) before converting.
488+
* Previously CROSS_CHANNEL_FIRST_CLICK
486489
* </pre>
487490
*
488-
* <code>CROSS_CHANNEL_FIRST_CLICK = 3;</code>
491+
* <code>PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK = 3;</code>
489492
*/
490-
CROSS_CHANNEL_FIRST_CLICK(3),
493+
PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK(3),
491494
/**
492495
*
493496
*
494497
* <pre>
495498
* Starting in June 2023, new properties can no longer use this model.
496499
* See
497500
* [Analytics
498-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
501+
* Help](https://support.google.com/analytics/answer/9164320#040623)
499502
* for more details.
500503
* Starting in September 2023, we will sunset this model for all properties.
501504
*
502505
* Distributes the credit for the conversion equally across all the channels
503506
* a customer clicked (or engaged view through for YouTube) before
504507
* converting.
508+
* Previously CROSS_CHANNEL_LINEAR
505509
* </pre>
506510
*
507-
* <code>CROSS_CHANNEL_LINEAR = 4;</code>
511+
* <code>PAID_AND_ORGANIC_CHANNELS_LINEAR = 4;</code>
508512
*/
509-
CROSS_CHANNEL_LINEAR(4),
513+
PAID_AND_ORGANIC_CHANNELS_LINEAR(4),
510514
/**
511515
*
512516
*
513517
* <pre>
514518
* Starting in June 2023, new properties can no longer use this model.
515519
* See
516520
* [Analytics
517-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
521+
* Help](https://support.google.com/analytics/answer/9164320#040623)
518522
* for more details.
519523
* Starting in September 2023, we will sunset this model for all properties.
520524
*
521525
* Attributes 40% credit to the first and last interaction, and the
522526
* remaining 20% credit is distributed evenly to the middle interactions.
527+
* Previously CROSS_CHANNEL_POSITION_BASED
523528
* </pre>
524529
*
525-
* <code>CROSS_CHANNEL_POSITION_BASED = 5;</code>
530+
* <code>PAID_AND_ORGANIC_CHANNELS_POSITION_BASED = 5;</code>
526531
*/
527-
CROSS_CHANNEL_POSITION_BASED(5),
532+
PAID_AND_ORGANIC_CHANNELS_POSITION_BASED(5),
528533
/**
529534
*
530535
*
531536
* <pre>
532537
* Starting in June 2023, new properties can no longer use this model.
533538
* See
534539
* [Analytics
535-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
540+
* Help](https://support.google.com/analytics/answer/9164320#040623)
536541
* for more details.
537542
* Starting in September 2023, we will sunset this model for all properties.
538543
*
539544
* Gives more credit to the touchpoints that happened closer in time to
540545
* the conversion.
546+
* Previously CROSS_CHANNEL_TIME_DECAY
541547
* </pre>
542548
*
543-
* <code>CROSS_CHANNEL_TIME_DECAY = 6;</code>
549+
* <code>PAID_AND_ORGANIC_CHANNELS_TIME_DECAY = 6;</code>
544550
*/
545-
CROSS_CHANNEL_TIME_DECAY(6),
551+
PAID_AND_ORGANIC_CHANNELS_TIME_DECAY(6),
546552
/**
547553
*
548554
*
549555
* <pre>
550-
* Attributes 100% of the conversion value to the last Google Ads channel
556+
* Attributes 100% of the conversion value to the last Google Paid channel
551557
* that the customer clicked through before converting.
558+
* Previously ADS_PREFERRED_LAST_CLICK
552559
* </pre>
553560
*
554-
* <code>ADS_PREFERRED_LAST_CLICK = 7;</code>
561+
* <code>GOOGLE_PAID_CHANNELS_LAST_CLICK = 7;</code>
555562
*/
556-
ADS_PREFERRED_LAST_CLICK(7),
563+
GOOGLE_PAID_CHANNELS_LAST_CLICK(7),
557564
UNRECOGNIZED(-1),
558565
;
559566

@@ -574,107 +581,114 @@ public enum ReportingAttributionModel implements com.google.protobuf.ProtocolMes
574581
* Data-driven attribution distributes credit for the conversion based on
575582
* data for each conversion event. Each Data-driven model is specific to
576583
* each advertiser and each conversion event.
584+
* Previously CROSS_CHANNEL_DATA_DRIVEN
577585
* </pre>
578586
*
579-
* <code>CROSS_CHANNEL_DATA_DRIVEN = 1;</code>
587+
* <code>PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN = 1;</code>
580588
*/
581-
public static final int CROSS_CHANNEL_DATA_DRIVEN_VALUE = 1;
589+
public static final int PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN_VALUE = 1;
582590
/**
583591
*
584592
*
585593
* <pre>
586594
* Ignores direct traffic and attributes 100% of the conversion value to the
587595
* last channel that the customer clicked through (or engaged view through
588596
* for YouTube) before converting.
597+
* Previously CROSS_CHANNEL_LAST_CLICK
589598
* </pre>
590599
*
591-
* <code>CROSS_CHANNEL_LAST_CLICK = 2;</code>
600+
* <code>PAID_AND_ORGANIC_CHANNELS_LAST_CLICK = 2;</code>
592601
*/
593-
public static final int CROSS_CHANNEL_LAST_CLICK_VALUE = 2;
602+
public static final int PAID_AND_ORGANIC_CHANNELS_LAST_CLICK_VALUE = 2;
594603
/**
595604
*
596605
*
597606
* <pre>
598607
* Starting in June 2023, new properties can no longer use this model.
599608
* See
600609
* [Analytics
601-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
610+
* Help](https://support.google.com/analytics/answer/9164320#040623)
602611
* for more details.
603612
* Starting in September 2023, we will sunset this model for all properties.
604613
*
605614
* Gives all credit for the conversion to the first channel that a customer
606615
* clicked (or engaged view through for YouTube) before converting.
616+
* Previously CROSS_CHANNEL_FIRST_CLICK
607617
* </pre>
608618
*
609-
* <code>CROSS_CHANNEL_FIRST_CLICK = 3;</code>
619+
* <code>PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK = 3;</code>
610620
*/
611-
public static final int CROSS_CHANNEL_FIRST_CLICK_VALUE = 3;
621+
public static final int PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK_VALUE = 3;
612622
/**
613623
*
614624
*
615625
* <pre>
616626
* Starting in June 2023, new properties can no longer use this model.
617627
* See
618628
* [Analytics
619-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
629+
* Help](https://support.google.com/analytics/answer/9164320#040623)
620630
* for more details.
621631
* Starting in September 2023, we will sunset this model for all properties.
622632
*
623633
* Distributes the credit for the conversion equally across all the channels
624634
* a customer clicked (or engaged view through for YouTube) before
625635
* converting.
636+
* Previously CROSS_CHANNEL_LINEAR
626637
* </pre>
627638
*
628-
* <code>CROSS_CHANNEL_LINEAR = 4;</code>
639+
* <code>PAID_AND_ORGANIC_CHANNELS_LINEAR = 4;</code>
629640
*/
630-
public static final int CROSS_CHANNEL_LINEAR_VALUE = 4;
641+
public static final int PAID_AND_ORGANIC_CHANNELS_LINEAR_VALUE = 4;
631642
/**
632643
*
633644
*
634645
* <pre>
635646
* Starting in June 2023, new properties can no longer use this model.
636647
* See
637648
* [Analytics
638-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
649+
* Help](https://support.google.com/analytics/answer/9164320#040623)
639650
* for more details.
640651
* Starting in September 2023, we will sunset this model for all properties.
641652
*
642653
* Attributes 40% credit to the first and last interaction, and the
643654
* remaining 20% credit is distributed evenly to the middle interactions.
655+
* Previously CROSS_CHANNEL_POSITION_BASED
644656
* </pre>
645657
*
646-
* <code>CROSS_CHANNEL_POSITION_BASED = 5;</code>
658+
* <code>PAID_AND_ORGANIC_CHANNELS_POSITION_BASED = 5;</code>
647659
*/
648-
public static final int CROSS_CHANNEL_POSITION_BASED_VALUE = 5;
660+
public static final int PAID_AND_ORGANIC_CHANNELS_POSITION_BASED_VALUE = 5;
649661
/**
650662
*
651663
*
652664
* <pre>
653665
* Starting in June 2023, new properties can no longer use this model.
654666
* See
655667
* [Analytics
656-
* Help](https://support.google.com/analytics/answer/9164320?hl=en#040623)
668+
* Help](https://support.google.com/analytics/answer/9164320#040623)
657669
* for more details.
658670
* Starting in September 2023, we will sunset this model for all properties.
659671
*
660672
* Gives more credit to the touchpoints that happened closer in time to
661673
* the conversion.
674+
* Previously CROSS_CHANNEL_TIME_DECAY
662675
* </pre>
663676
*
664-
* <code>CROSS_CHANNEL_TIME_DECAY = 6;</code>
677+
* <code>PAID_AND_ORGANIC_CHANNELS_TIME_DECAY = 6;</code>
665678
*/
666-
public static final int CROSS_CHANNEL_TIME_DECAY_VALUE = 6;
679+
public static final int PAID_AND_ORGANIC_CHANNELS_TIME_DECAY_VALUE = 6;
667680
/**
668681
*
669682
*
670683
* <pre>
671-
* Attributes 100% of the conversion value to the last Google Ads channel
684+
* Attributes 100% of the conversion value to the last Google Paid channel
672685
* that the customer clicked through before converting.
686+
* Previously ADS_PREFERRED_LAST_CLICK
673687
* </pre>
674688
*
675-
* <code>ADS_PREFERRED_LAST_CLICK = 7;</code>
689+
* <code>GOOGLE_PAID_CHANNELS_LAST_CLICK = 7;</code>
676690
*/
677-
public static final int ADS_PREFERRED_LAST_CLICK_VALUE = 7;
691+
public static final int GOOGLE_PAID_CHANNELS_LAST_CLICK_VALUE = 7;
678692

679693
public final int getNumber() {
680694
if (this == UNRECOGNIZED) {
@@ -703,19 +717,19 @@ public static ReportingAttributionModel forNumber(int value) {
703717
case 0:
704718
return REPORTING_ATTRIBUTION_MODEL_UNSPECIFIED;
705719
case 1:
706-
return CROSS_CHANNEL_DATA_DRIVEN;
720+
return PAID_AND_ORGANIC_CHANNELS_DATA_DRIVEN;
707721
case 2:
708-
return CROSS_CHANNEL_LAST_CLICK;
722+
return PAID_AND_ORGANIC_CHANNELS_LAST_CLICK;
709723
case 3:
710-
return CROSS_CHANNEL_FIRST_CLICK;
724+
return PAID_AND_ORGANIC_CHANNELS_FIRST_CLICK;
711725
case 4:
712-
return CROSS_CHANNEL_LINEAR;
726+
return PAID_AND_ORGANIC_CHANNELS_LINEAR;
713727
case 5:
714-
return CROSS_CHANNEL_POSITION_BASED;
728+
return PAID_AND_ORGANIC_CHANNELS_POSITION_BASED;
715729
case 6:
716-
return CROSS_CHANNEL_TIME_DECAY;
730+
return PAID_AND_ORGANIC_CHANNELS_TIME_DECAY;
717731
case 7:
718-
return ADS_PREFERRED_LAST_CLICK;
732+
return GOOGLE_PAID_CHANNELS_LAST_CLICK;
719733
default:
720734
return null;
721735
}
@@ -810,22 +824,27 @@ public enum AdsWebConversionDataExportScope implements com.google.protobuf.Proto
810824
*
811825
*
812826
* <pre>
813-
* The Ads Web Conversion Data export scope is Cross Channel.
827+
* Paid and organic channels are eligible to receive conversion credit, but
828+
* only credit assigned to Google Ads channels will appear in your Ads
829+
* accounts. To learn more, see [Paid and Organic
830+
* channels](https://support.google.com/analytics/answer/10632359).
814831
* </pre>
815832
*
816-
* <code>CROSS_CHANNEL = 2;</code>
833+
* <code>PAID_AND_ORGANIC_CHANNELS = 2;</code>
817834
*/
818-
CROSS_CHANNEL(2),
835+
PAID_AND_ORGANIC_CHANNELS(2),
819836
/**
820837
*
821838
*
822839
* <pre>
823-
* The Ads Web Conversion Data export scope is Ads Preferred.
840+
* Only Google Ads paid channels are eligible to receive conversion credit.
841+
* To learn more, see [Google Paid
842+
* channels](https://support.google.com/analytics/answer/10632359).
824843
* </pre>
825844
*
826-
* <code>ADS_PREFERRED = 3;</code>
845+
* <code>GOOGLE_PAID_CHANNELS = 3;</code>
827846
*/
828-
ADS_PREFERRED(3),
847+
GOOGLE_PAID_CHANNELS(3),
829848
UNRECOGNIZED(-1),
830849
;
831850

@@ -854,22 +873,27 @@ public enum AdsWebConversionDataExportScope implements com.google.protobuf.Proto
854873
*
855874
*
856875
* <pre>
857-
* The Ads Web Conversion Data export scope is Cross Channel.
876+
* Paid and organic channels are eligible to receive conversion credit, but
877+
* only credit assigned to Google Ads channels will appear in your Ads
878+
* accounts. To learn more, see [Paid and Organic
879+
* channels](https://support.google.com/analytics/answer/10632359).
858880
* </pre>
859881
*
860-
* <code>CROSS_CHANNEL = 2;</code>
882+
* <code>PAID_AND_ORGANIC_CHANNELS = 2;</code>
861883
*/
862-
public static final int CROSS_CHANNEL_VALUE = 2;
884+
public static final int PAID_AND_ORGANIC_CHANNELS_VALUE = 2;
863885
/**
864886
*
865887
*
866888
* <pre>
867-
* The Ads Web Conversion Data export scope is Ads Preferred.
889+
* Only Google Ads paid channels are eligible to receive conversion credit.
890+
* To learn more, see [Google Paid
891+
* channels](https://support.google.com/analytics/answer/10632359).
868892
* </pre>
869893
*
870-
* <code>ADS_PREFERRED = 3;</code>
894+
* <code>GOOGLE_PAID_CHANNELS = 3;</code>
871895
*/
872-
public static final int ADS_PREFERRED_VALUE = 3;
896+
public static final int GOOGLE_PAID_CHANNELS_VALUE = 3;
873897

874898
public final int getNumber() {
875899
if (this == UNRECOGNIZED) {
@@ -900,9 +924,9 @@ public static AdsWebConversionDataExportScope forNumber(int value) {
900924
case 1:
901925
return NOT_SELECTED_YET;
902926
case 2:
903-
return CROSS_CHANNEL;
927+
return PAID_AND_ORGANIC_CHANNELS;
904928
case 3:
905-
return ADS_PREFERRED;
929+
return GOOGLE_PAID_CHANNELS;
906930
default:
907931
return null;
908932
}

0 commit comments

Comments
 (0)