diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json index dae7723d5d09..b248255e499e 100644 --- a/extensions/amp-analytics/0.1/test/vendor-requests.json +++ b/extensions/amp-analytics/0.1/test/vendor-requests.json @@ -541,10 +541,11 @@ }, "top100": { "host": "https://kraken.rambler.ru", - "base": "https://kraken.rambler.ru/cnt/?pid=!pid&rid=_page_view_id_&v=1.0.1&rn=_random_&tid=_client_id(top100_id)_&ct=amp", - "pageview": "https://kraken.rambler.ru/cnt/?pid=!pid&rid=_page_view_id_&v=1.0.1&rn=_random_&tid=_client_id(top100_id)_&ct=amp&et=pv&url=_canonical_url_&pt=_title_&rf=_document_referrer_&en=_document_charset_&la=_browser_language_&tz=_timezone_&sr=_screen_width_x_screen_height_&cd=_screen_color_depth_-bit&bs=_scroll_width_x_scroll_height_", - "_screenData": "&sr=_screen_width_x_screen_height_&cd=_screen_color_depth_-bit&bs=_scroll_width_x_scroll_height_", - "_pageData": "&url=_canonical_url_&pt=_title_&rf=_document_referrer_&en=_document_charset_&la=_browser_language_&tz=_timezone_" + "base": "https://kraken.rambler.ru/cnt/v2/?project_id=!pid&version=1.1.0&top100_id=_client_id(top100_id)_&counter_type=amp", + "pageview": "https://kraken.rambler.ru/cnt/v2/?project_id=!pid&version=1.1.0&top100_id=_client_id(top100_id)_&counter_type=amp&event_type=base&event_name=page_view&session_id=_page_view_id_64_&request_id=_page_view_id_&url=_canonical_url_&event_id=_random_&meta={language:_browser_language_,title:_title_,referer:_document_referrer_,screen_size:_screen_width_x_screen_height_,color_depth:_screen_color_depth_-bit,browser_size:_scroll_width_x_scroll_height_,timezone:_timezone_}", + "_eventData": "&session_id=_page_view_id_64_&request_id=_page_view_id_&url=_canonical_url_&event_id=_random_", + "_metaPVData": "https://kraken.rambler.ru/cnt/v2/?project_id=!pid&version=1.1.0&top100_id=_client_id(top100_id)_&counter_type=amp&event_type=base&event_name=page_view&session_id=_page_view_id_64_&request_id=_page_view_id_&url=_canonical_url_&event_id=_random_&meta={language:_browser_language_,title:_title_,referer:_document_referrer_,screen_size:_screen_width_x_screen_height_,color_depth:_screen_color_depth_-bit,browser_size:_scroll_width_x_scroll_height_,timezone:_timezone_}", + "_metaPingData": "num:${requestCount},duration:15" }, "topmailru": { "pageView": "https://top-fwz1.mail.ru/counter?js=13;id=!id;u=_source_url_;r=_document_referrer_;s=_screen_width_*_screen_height_;vp=_viewport_width_*_viewport_height_;st=!start;gender=!gender;age=!age;pid=!pid;userid=!userid;device=!device;params=!params;_=_random_;title=_title_", diff --git a/extensions/amp-analytics/0.1/vendors/top100.json b/extensions/amp-analytics/0.1/vendors/top100.json index 849c40810fba..8ddf0105b111 100644 --- a/extensions/amp-analytics/0.1/vendors/top100.json +++ b/extensions/amp-analytics/0.1/vendors/top100.json @@ -1,16 +1,16 @@ { "vars": { "pid": "", - "rid": "PAGE_VIEW_ID", - "tid": "CLIENT_ID(top100_id)", - "version": "1.0.1" + "request_id": "PAGE_VIEW_ID_64", + "top100_id": "CLIENT_ID(top100_id)", + "version": "1.1.0" }, "requests": { "host": "https://kraken.rambler.ru", - "base": "${host}/cnt/?pid=${pid}&rid=${rid}&v=${version}&rn=${random}&tid=${tid}&ct=amp", - "pageview": "${base}&et=pv${_pageData}${_screenData}", - "_screenData": "&sr=${screenWidth}x${screenHeight}&cd=${screenColorDepth}-bit&bs=${scrollWidth}x${scrollHeight}", - "_pageData": "&url=${canonicalUrl}&pt=${title}&rf=${documentReferrer}&en=${documentCharset}&la=${browserLanguage}&tz=${timezone}" + "base": "${host}/cnt/v2/?project_id=${pid}&version=${version}&top100_id=${top100_id}&counter_type=amp", + "pageview": "${base}&event_type=base&event_name=page_view${_eventData}&meta={${_metaPVData}}", + "_eventData": "&session_id=${request_id}&request_id=${pageViewId}&url=${canonicalUrl}&event_id=${random}", + "_metaPVData": "language:${browserLanguage},title:${title},referer:${documentReferrer},screen_size:${screenWidth}x${screenHeight},color_depth:${screenColorDepth}-bit,browser_size:${scrollWidth}x${scrollHeight},timezone:${timezone}" }, "triggers": { "trackPageview": { @@ -19,8 +19,8 @@ } }, "transport": { - "beacon": false, - "xhrpost": false, + "beacon": true, + "xhrpost": true, "image": true } }