From 005a0d79c3c97a693a6cbf8798661f98ae7068ca Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 14 Oct 2019 17:37:09 -0500 Subject: [PATCH 1/7] add support for data, plid, pvid request properties --- extensions/amp-analytics/0.1/vendors/parsely.js | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/extensions/amp-analytics/0.1/vendors/parsely.js b/extensions/amp-analytics/0.1/vendors/parsely.js index ea2f4808e54c..2766d463e7f2 100644 --- a/extensions/amp-analytics/0.1/vendors/parsely.js +++ b/extensions/amp-analytics/0.1/vendors/parsely.js @@ -17,20 +17,28 @@ import {jsonLiteral} from '../../../../src/json'; const PARSELY_CONFIG = jsonLiteral({ + 'vars': { + 'data': '{}', + 'plid': Math.floor(Math.random() * 99999999), + 'pvid': Math.floor(Math.random() * 99999999), + }, 'requests': { 'host': 'https://srv.pixel.parsely.com', 'basePrefix': '${host}/plogger/?' + 'rand=${timestamp}&' + + 'plid=${plid}&' + 'idsite=${apikey}&' + 'url=${ampdocUrl}&' + 'urlref=${documentReferrer}&' + 'screen=${screenWidth}x${screenHeight}%7C' + '${availableScreenWidth}x${availableScreenHeight}%7C' + '${screenColorDepth}&' + + 'data=${data}&' + 'title=${title}&' + 'date=${timestamp}&' + - 'ampid=${clientId(_parsely_visitor)}', + 'ampid=${clientId(_parsely_visitor)}&' + + 'pvid=${pvid}', 'pageview': '${basePrefix}&action=pageview&metadata=' + '{"canonical_url":"${canonicalUrl}"}', From 35709928d3a3cf023e6550869cc086bd36f9a607 Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 21 Oct 2019 17:07:10 -0500 Subject: [PATCH 2/7] use built-in pageViewId for plid and pvid --- extensions/amp-analytics/0.1/vendors/parsely.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/amp-analytics/0.1/vendors/parsely.js b/extensions/amp-analytics/0.1/vendors/parsely.js index 2766d463e7f2..007026c145fb 100644 --- a/extensions/amp-analytics/0.1/vendors/parsely.js +++ b/extensions/amp-analytics/0.1/vendors/parsely.js @@ -19,15 +19,13 @@ import {jsonLiteral} from '../../../../src/json'; const PARSELY_CONFIG = jsonLiteral({ 'vars': { 'data': '{}', - 'plid': Math.floor(Math.random() * 99999999), - 'pvid': Math.floor(Math.random() * 99999999), }, 'requests': { 'host': 'https://srv.pixel.parsely.com', 'basePrefix': '${host}/plogger/?' + 'rand=${timestamp}&' + - 'plid=${plid}&' + + 'plid=${pageViewId}&' + 'idsite=${apikey}&' + 'url=${ampdocUrl}&' + 'urlref=${documentReferrer}&' + @@ -38,7 +36,7 @@ const PARSELY_CONFIG = jsonLiteral({ 'title=${title}&' + 'date=${timestamp}&' + 'ampid=${clientId(_parsely_visitor)}&' + - 'pvid=${pvid}', + 'pvid=${pageViewId}', 'pageview': '${basePrefix}&action=pageview&metadata=' + '{"canonical_url":"${canonicalUrl}"}', From 5bf0e2150cc241a72692a6be5a35e75775e69ecf Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Tue, 22 Oct 2019 11:54:37 -0500 Subject: [PATCH 3/7] update parsely test requests --- extensions/amp-analytics/0.1/test/vendor-requests.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json index 6aa5690fc6db..83c563b34a8e 100644 --- a/extensions/amp-analytics/0.1/test/vendor-requests.json +++ b/extensions/amp-analytics/0.1/test/vendor-requests.json @@ -316,9 +316,9 @@ }, "parsely": { "host": "https://srv.pixel.parsely.com", - "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&id=_client_id_", - "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&id=_client_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", - "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&title=_title_&date=_timestamp_&id=_client_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" + "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", + "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", + "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" }, "permutive": { "track": "https://!namespace.amp.permutive.com/track?k=!key&i=_client_id_&it=amp&_ep_client.type=amp&_ep_client.title=_title_&_ep_client.domain=_canonical_host_&_ep_client.url=_canonical_url_&_ep_client.referrer=_document_referrer_&_ep_client.user_agent=_user_agent_", From 89f9fc66c23fdf210a04b1f2d37ae1e00872edfd Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Tue, 22 Oct 2019 15:05:02 -0500 Subject: [PATCH 4/7] format data variable correctly in test --- extensions/amp-analytics/0.1/test/vendor-requests.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json index 83c563b34a8e..ed6b5a62e8f2 100644 --- a/extensions/amp-analytics/0.1/test/vendor-requests.json +++ b/extensions/amp-analytics/0.1/test/vendor-requests.json @@ -316,9 +316,9 @@ }, "parsely": { "host": "https://srv.pixel.parsely.com", - "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", - "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", - "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=!data&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" + "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", + "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", + "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" }, "permutive": { "track": "https://!namespace.amp.permutive.com/track?k=!key&i=_client_id_&it=amp&_ep_client.type=amp&_ep_client.title=_title_&_ep_client.domain=_canonical_host_&_ep_client.url=_canonical_url_&_ep_client.referrer=_document_referrer_&_ep_client.user_agent=_user_agent_", From 2295d672b6c4950aa28e7ef0c42728f9b43163a4 Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Tue, 22 Oct 2019 17:01:21 -0500 Subject: [PATCH 5/7] hardcode default data in test --- extensions/amp-analytics/0.1/test/vendor-requests.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json index ed6b5a62e8f2..0bbdf83755c3 100644 --- a/extensions/amp-analytics/0.1/test/vendor-requests.json +++ b/extensions/amp-analytics/0.1/test/vendor-requests.json @@ -316,9 +316,9 @@ }, "parsely": { "host": "https://srv.pixel.parsely.com", - "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", - "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", - "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=_data_&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" + "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", + "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", + "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" }, "permutive": { "track": "https://!namespace.amp.permutive.com/track?k=!key&i=_client_id_&it=amp&_ep_client.type=amp&_ep_client.title=_title_&_ep_client.domain=_canonical_host_&_ep_client.url=_canonical_url_&_ep_client.referrer=_document_referrer_&_ep_client.user_agent=_user_agent_", From db011313b1c972c1a9e0b0a3e1651ea8c4ae37ac Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 4 Nov 2019 16:36:20 -0600 Subject: [PATCH 6/7] revert pvid and plid values until we develop full solution --- extensions/amp-analytics/0.1/test/vendor-requests.json | 6 +++--- extensions/amp-analytics/0.1/vendors/parsely.js | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/extensions/amp-analytics/0.1/test/vendor-requests.json b/extensions/amp-analytics/0.1/test/vendor-requests.json index c208c61661ba..882baa56b33b 100644 --- a/extensions/amp-analytics/0.1/test/vendor-requests.json +++ b/extensions/amp-analytics/0.1/test/vendor-requests.json @@ -317,9 +317,9 @@ }, "parsely": { "host": "https://srv.pixel.parsely.com", - "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_", - "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", - "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&plid=_page_view_id_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&pvid=_page_view_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" + "basePrefix": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_", + "pageview": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&action=pageview&metadata={\"canonical_url\":\"_canonical_url_\"}", + "heartbeat": "https://srv.pixel.parsely.com/plogger/?rand=_timestamp_&idsite=!apikey&url=_ampdoc_url_&urlref=_document_referrer_&screen=_screen_width_x_screen_height_%7C_available_screen_width_x_available_screen_height_%7C_screen_color_depth_&data=%7B%7D&title=_title_&date=_timestamp_&id=_client_id_&action=heartbeat&tt=_total_engaged_time_&inc=_incremental_engaged_time_" }, "permutive": { "track": "https://!namespace.amp.permutive.com/track?k=!key&i=_client_id_&it=amp&_ep_client.type=amp&_ep_client.title=_title_&_ep_client.domain=_canonical_host_&_ep_client.url=_canonical_url_&_ep_client.referrer=_document_referrer_&_ep_client.user_agent=_user_agent_", diff --git a/extensions/amp-analytics/0.1/vendors/parsely.js b/extensions/amp-analytics/0.1/vendors/parsely.js index 007026c145fb..ae779c7d1b96 100644 --- a/extensions/amp-analytics/0.1/vendors/parsely.js +++ b/extensions/amp-analytics/0.1/vendors/parsely.js @@ -25,7 +25,6 @@ const PARSELY_CONFIG = jsonLiteral({ 'basePrefix': '${host}/plogger/?' + 'rand=${timestamp}&' + - 'plid=${pageViewId}&' + 'idsite=${apikey}&' + 'url=${ampdocUrl}&' + 'urlref=${documentReferrer}&' + @@ -35,8 +34,7 @@ const PARSELY_CONFIG = jsonLiteral({ 'data=${data}&' + 'title=${title}&' + 'date=${timestamp}&' + - 'ampid=${clientId(_parsely_visitor)}&' + - 'pvid=${pageViewId}', + 'ampid=${clientId(_parsely_visitor)}&', 'pageview': '${basePrefix}&action=pageview&metadata=' + '{"canonical_url":"${canonicalUrl}"}', From e5857b453d13a3a75280bed2ac519f58cab38dfc Mon Sep 17 00:00:00 2001 From: Josh Romero Date: Mon, 4 Nov 2019 16:42:17 -0600 Subject: [PATCH 7/7] remove trailing ampersand --- extensions/amp-analytics/0.1/vendors/parsely.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/amp-analytics/0.1/vendors/parsely.js b/extensions/amp-analytics/0.1/vendors/parsely.js index ae779c7d1b96..9291dd8c0b17 100644 --- a/extensions/amp-analytics/0.1/vendors/parsely.js +++ b/extensions/amp-analytics/0.1/vendors/parsely.js @@ -34,7 +34,7 @@ const PARSELY_CONFIG = jsonLiteral({ 'data=${data}&' + 'title=${title}&' + 'date=${timestamp}&' + - 'ampid=${clientId(_parsely_visitor)}&', + 'ampid=${clientId(_parsely_visitor)}', 'pageview': '${basePrefix}&action=pageview&metadata=' + '{"canonical_url":"${canonicalUrl}"}',