Skip to content

Commit

Permalink
[amp-analytics] googleanalytics and gtag opt out of CID backup (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
Micajuine Ho committed Feb 24, 2021
1 parent 85fbc06 commit 7ef9f7c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
22 changes: 11 additions & 11 deletions extensions/amp-analytics/0.1/test/vendor-requests.json
Expand Up @@ -156,24 +156,24 @@
},
"googleanalytics": {
"host": "https://www.google-analytics.com",
"basePrefix": "v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_",
"basePrefix": "v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_",
"baseSuffix": "&a=_page_view_id_&z=_random_",
"pageview": "https://www.google-analytics.com/r/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&_r=1&a=_page_view_id_&z=_random_",
"event": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=event&jid=&ec=!eventCategory&ea=!eventAction&el=!eventLabel&ev=0&a=_page_view_id_&z=_random_",
"social": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=social&jid=&sa=!socialAction&sn=!socialNetwork&st=!socialTarget&a=_page_view_id_&z=_random_",
"timing": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=!timingRequestType&jid=&plt=_page_load_time_&dns=_domain_lookup_time_&tcp=_tcp_connect_time_&rrt=_redirect_time_&srt=_server_response_time_&pdt=_page_download_time_&clt=_content_load_time_&dit=_dom_interactive_time_&a=_page_view_id_&z=_random_",
"error": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=exception&exd=!errorName-!errorMessage&a=_page_view_id_&z=_random_"
"pageview": "https://www.google-analytics.com/r/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&_r=1&a=_page_view_id_&z=_random_",
"event": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=event&jid=&ec=!eventCategory&ea=!eventAction&el=!eventLabel&ev=0&a=_page_view_id_&z=_random_",
"social": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=social&jid=&sa=!socialAction&sn=!socialNetwork&st=!socialTarget&a=_page_view_id_&z=_random_",
"timing": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=!timingRequestType&jid=&plt=_page_load_time_&dns=_domain_lookup_time_&tcp=_tcp_connect_time_&rrt=_redirect_time_&srt=_server_response_time_&pdt=_page_download_time_&clt=_content_load_time_&dit=_dom_interactive_time_&a=_page_view_id_&z=_random_",
"error": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&_utmht=_timestamp_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!account&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=exception&exd=!errorName-!errorMessage&a=_page_view_id_&z=_random_"
},
"gtag": {
"uaHost": "<ignore for test>",
"uaBasePrefix": "<ignore for test>",
"uaBaseSuffix": "<ignore for test>",
"uaPageviewCommon": "<ignore for test>",
"uaPageview": "https://www.google-analytics.com/r/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&gjid=_random_&_r=1&a=_page_view_id_&z=_random_",
"uaPageviewNpa": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&gjid=_random_&_r=1&a=_page_view_id_&z=_random_",
"uaEvent": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=event&jid=&a=_page_view_id_&z=_random_",
"uaTiming": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&jid=&plt=_page_load_time_&dns=_domain_lookup_time_&tcp=_tcp_connect_time_&rrt=_redirect_time_&srt=_server_response_time_&pdt=_page_download_time_&clt=_content_load_time_&dit=_dom_interactive_time_&a=_page_view_id_&z=_random_",
"uaError": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=exception&exd=!errorName-!errorMessage&a=_page_view_id_&z=_random_",
"uaPageview": "https://www.google-analytics.com/r/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&gjid=_random_&_r=1&a=_page_view_id_&z=_random_",
"uaPageviewNpa": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=pageview&jid=_random_&gjid=_random_&_r=1&a=_page_view_id_&z=_random_",
"uaEvent": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=event&jid=&a=_page_view_id_&z=_random_",
"uaTiming": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&jid=&plt=_page_load_time_&dns=_domain_lookup_time_&tcp=_tcp_connect_time_&rrt=_redirect_time_&srt=_server_response_time_&pdt=_page_download_time_&clt=_content_load_time_&dit=_dom_interactive_time_&a=_page_view_id_&z=_random_",
"uaError": "https://www.google-analytics.com/collect?v=1&_v=a1&ds=AMP&aip&_s=1&dt=_title_&sr=_screen_width_x_screen_height_&cid=_client_id(AMP_ECID_GOOGLE%2C%2C_ga%2Ctrue)_&tid=!trackingId&dl=_source_url_&dr=_external_referrer_&sd=_screen_color_depth_&ul=_browser_language_&de=_document_charset_&t=exception&exd=!errorName-!errorMessage&a=_page_view_id_&z=_random_",
"awConversionPrefix": "<ignore for test>",
"awRemarketingPrefix": "<ignore for test>",
"awCommonParams": "<ignore for test>",
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/vendors/googleanalytics.json
Expand Up @@ -2,7 +2,7 @@
"vars": {
"eventValue": "0",
"documentLocation": "SOURCE_URL",
"clientId": "CLIENT_ID(AMP_ECID_GOOGLE,,_ga)",
"clientId": "CLIENT_ID(AMP_ECID_GOOGLE,,_ga,true)",
"dataSource": "AMP",
"anonymizeIP": "aip",
"errorParam": "${errorName}-${errorMessage}"
Expand Down
2 changes: 1 addition & 1 deletion extensions/amp-analytics/0.1/vendors/gtag.json
Expand Up @@ -18,7 +18,7 @@
},
"vars": {
"eventValue": "0",
"clientId": "CLIENT_ID(AMP_ECID_GOOGLE,,_ga)",
"clientId": "CLIENT_ID(AMP_ECID_GOOGLE,,_ga,true)",
"dataSource": "AMP",
"anonymizeIP": "aip",
"errorParam": "${errorName}-${errorMessage}"
Expand Down

0 comments on commit 7ef9f7c

Please sign in to comment.