From de7e5020fefbaef3d7adb9e9ddbf1a8adbe0c3f5 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:48:04 +0000 Subject: [PATCH 1/7] (2019-10-01, 0ab715ef1) `amp-action-macro`: 1 Previous history on prod-config.json: - 0ab715ef1 - 2019-10-01T10:32:36-04:00 - Launch --- build-system/global-configs/canary-config.json | 1 - build-system/global-configs/prod-config.json | 1 - extensions/amp-action-macro/0.1/amp-action-macro.js | 4 ++-- .../amp-action-macro/0.1/test/test-amp-action-macro.js | 8 ++------ tools/experiments/experiments-config.js | 6 ------ 5 files changed, 4 insertions(+), 16 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index 97009db4f1a2..de86dcbd3a39 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -5,7 +5,6 @@ "canary": 1, "a4aProfilingRate": 0.01, "adsense-ad-size-optimization": 0.1, - "amp-action-macro": 1, "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index bd269cec178e..963be08c153a 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -5,7 +5,6 @@ "a4aProfilingRate": 0.01, "adsense-ad-size-optimization": 0.1, "amp-accordion-display-locking": 1, - "amp-action-macro": 1, "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, diff --git a/extensions/amp-action-macro/0.1/amp-action-macro.js b/extensions/amp-action-macro/0.1/amp-action-macro.js index 199c9fbbdeda..f722181715f3 100644 --- a/extensions/amp-action-macro/0.1/amp-action-macro.js +++ b/extensions/amp-action-macro/0.1/amp-action-macro.js @@ -15,7 +15,6 @@ */ import {LayoutPriority} from '../../../src/layout'; import {Services} from '../../../src/services'; -import {isExperimentOn} from '../../../src/experiments'; import {userAssert} from '../../../src/log'; /** @const {string} */ @@ -39,7 +38,8 @@ export class AmpActionMacro extends AMP.BaseElement { /** @override */ buildCallback() { userAssert( - isExperimentOn(this.win, 'amp-action-macro'), + /* isExperimentOn(this.win, 'amp-action-macro') // launched: true */ + true, 'Experiment is off' ); const {element} = this; diff --git a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js index 4759511a07a3..52f334bc776c 100644 --- a/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js +++ b/extensions/amp-action-macro/0.1/test/test-amp-action-macro.js @@ -18,7 +18,6 @@ import {ActionInvocation} from '../../../../src/service/action-impl'; import {ActionTrust} from '../../../../src/action-constants'; import {AmpActionMacro} from '../amp-action-macro'; import {Services} from '../../../../src/services'; -import {toggleExperiment} from '../../../../src/experiments'; describes.realWin( 'amp-action-macro', @@ -35,8 +34,6 @@ describes.realWin( beforeEach(() => { win = env.win; doc = win.document; - - toggleExperiment(win, 'amp-action-macro', true); }); function newActionMacro() { @@ -60,7 +57,8 @@ describes.realWin( it('should not build if experiment is off', () => { return allowConsoleError(() => { - toggleExperiment(env.win, 'amp-action-macro', false); + /* toggleExperiment(env.win, 'amp-action-macro', false) // launched: true */ + false; return newActionMacro().catch((err) => { expect(err.message).to.include('Experiment is off'); }); @@ -75,8 +73,6 @@ describes.realWin( let unreferrableMacro; let unreferrableMacroElement; beforeEach(() => { - toggleExperiment(win, 'amp-action-macro', true); - // This macro is referrable and can be invoked by the macro element(s) // defined after it. referrableMacroElement = doc.createElement('amp-action-macro'); diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js index 999e1490fbad..fcedc01b7468 100644 --- a/tools/experiments/experiments-config.js +++ b/tools/experiments/experiments-config.js @@ -75,12 +75,6 @@ export const EXPERIMENTS = [ name: 'Allows the new lightbox experience to be used in A4A (prototype).', spec: 'https://github.com/ampproject/amphtml/issues/7743', }, - { - id: 'amp-action-macro', - name: 'AMP extension for defining action macros', - spec: 'https://github.com/ampproject/amphtml/issues/19494', - cleanupIssue: 'https://github.com/ampproject/amphtml/pull/19495', - }, { id: 'ios-fixed-no-transfer', name: 'Remove fixed transfer from iOS 12.2 and up', From afc052245449d213c0bf55d9427ded2f006ff487 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:48:21 +0000 Subject: [PATCH 2/7] (2018-11-05, d26327a3c) `amp-story-responsive-units`: 1 Previous history on prod-config.json: - d26327a3c - 2018-11-05T12:02:25-05:00 - Re-launch amp-story-responsive-units experiment - d5ec88b8a - 2018-10-30T16:01:59-07:00 - Unlaunch amp-story-responsive-units for urgent release - 65379df93 - 2018-10-26T15:27:09-04:00 - Launch amp-story-responsive-units experiment --- build-system/global-configs/canary-config.json | 1 - build-system/global-configs/prod-config.json | 1 - extensions/amp-story/1.0/test/test-amp-story.js | 7 +++---- tools/experiments/experiments-config.js | 6 ------ 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index de86dcbd3a39..9b0ab79fb846 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "amp-story-responsive-units": 1, "amp-story-v1": 1, "chunked-amp": 1, "doubleclickSraExp": 0.01, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index 963be08c153a..59ad1a6dcdeb 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "amp-story-responsive-units": 1, "amp-story-v1": 1, "chunked-amp": 1, "doubleclickSraExp": 0.01, diff --git a/extensions/amp-story/1.0/test/test-amp-story.js b/extensions/amp-story/1.0/test/test-amp-story.js index 1ac8cb2319e8..5d8162cbf8f6 100644 --- a/extensions/amp-story/1.0/test/test-amp-story.js +++ b/extensions/amp-story/1.0/test/test-amp-story.js @@ -1656,12 +1656,11 @@ describes.realWin( }); describe('amp-story rewriteStyles', () => { - beforeEach(() => { - toggleExperiment(win, 'amp-story-responsive-units', true); - }); + beforeEach(() => {}); afterEach(() => { - toggleExperiment(win, 'amp-story-responsive-units', false); + /* toggleExperiment(win, 'amp-story-responsive-units', false) // launched: true */ + false; }); it('should rewrite vw styles', async () => { diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js index fcedc01b7468..97b857e2763c 100644 --- a/tools/experiments/experiments-config.js +++ b/tools/experiments/experiments-config.js @@ -124,12 +124,6 @@ export const EXPERIMENTS = [ spec: 'https://github.com/ampproject/amphtml/issues/11329', cleanupIssue: 'https://github.com/ampproject/amphtml/issues/14357', }, - { - id: 'amp-story-responsive-units', - name: 'Scale pages in amp-story by rewriting responsive units', - spec: 'https://github.com/ampproject/amphtml/issues/15955', - cleanupIssue: 'https://github.com/ampproject/amphtml/issues/15960', - }, { id: 'amp-next-page', name: 'Document level next page recommendations and infinite scroll', From c0e566962bf7f6aa907af0f4144f813afe3cc101 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:48:29 +0000 Subject: [PATCH 3/7] (2018-07-11, 366b9d53e) `amp-story-v1`: 1 Previous history on prod-config.json: - 366b9d53e - 2018-07-11T12:03:09-04:00 - Revert "Remove launched experiments. (#16528)" - 3a3dbd963 - 2018-07-06T14:47:49-04:00 - Remove launched experiments. - 1194c1652 - 2018-06-12T11:38:38-04:00 - Start canonical adsense fast fetch experiments at 1% --- build-system/global-configs/canary-config.json | 1 - build-system/global-configs/prod-config.json | 1 - 2 files changed, 2 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index 9b0ab79fb846..7dbfed6e7588 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "amp-story-v1": 1, "chunked-amp": 1, "doubleclickSraExp": 0.01, "doubleclickSraReportExcludedBlock": 0.1, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index 59ad1a6dcdeb..0c6ffaf7376a 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "amp-story-v1": 1, "chunked-amp": 1, "doubleclickSraExp": 0.01, "doubleclickSraReportExcludedBlock": 0.1, From aaa77e400f858054bd266cc241c933e66af43ce3 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:48:36 +0000 Subject: [PATCH 4/7] (2018-07-11, 366b9d53e) `chunked-amp`: 1 Previous history on prod-config.json: - 366b9d53e - 2018-07-11T12:03:09-04:00 - Revert "Remove launched experiments. (#16528)" - 3a3dbd963 - 2018-07-06T14:47:49-04:00 - Remove launched experiments. - 34ffcdb16 - 2017-02-17T13:10:59-08:00 - turn on chunked-amp --- build-system/global-configs/canary-config.json | 1 - build-system/global-configs/prod-config.json | 1 - tools/experiments/experiments-config.js | 5 ----- 3 files changed, 7 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index 7dbfed6e7588..55e12b84aac5 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "chunked-amp": 1, "doubleclickSraExp": 0.01, "doubleclickSraReportExcludedBlock": 0.1, "dfp-render-on-idle-cwv-exp": 1, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index 0c6ffaf7376a..d4fe048b68a4 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -8,7 +8,6 @@ "amp-ad-ff-adx-ady": 0.01, "amp-auto-ads-adsense-holdout": 0.1, "ampdoc-fie": 1, - "chunked-amp": 1, "doubleclickSraExp": 0.01, "doubleclickSraReportExcludedBlock": 0.1, "expand-json-targeting": 1, diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js index 97b857e2763c..fd79ad85e0aa 100644 --- a/tools/experiments/experiments-config.js +++ b/tools/experiments/experiments-config.js @@ -81,11 +81,6 @@ export const EXPERIMENTS = [ spec: 'https://github.com/ampproject/amphtml/issues/22220', cleanupIssue: 'https://github.com/ampproject/amphtml/issues/22220', }, - { - id: 'chunked-amp', - name: "Split AMP's loading phase into chunks", - cleanupIssue: 'https://github.com/ampproject/amphtml/issues/5535', - }, { id: 'pump-early-frame', name: From cc7b94ff4e1c3e6cef09273b0a8dfbaf07e46e10 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:48:52 +0000 Subject: [PATCH 5/7] (2019-10-28, 4ca140956) `fix-inconsistent-responsive-height-selection`: 0 Previous history on prod-config.json: - 4ca140956 - 2019-10-28T15:54:36+00:00 - Ramp down inconsistent height selection fix experiment to 0%. This doesn't work very well on desktop / tablet so we need to fix that before proceeding. --- build-system/global-configs/canary-config.json | 1 - build-system/global-configs/prod-config.json | 1 - tools/experiments/experiments-config.js | 6 ------ 3 files changed, 8 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index 55e12b84aac5..2400c00277ae 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -12,7 +12,6 @@ "doubleclickSraReportExcludedBlock": 0.1, "dfp-render-on-idle-cwv-exp": 1, "expand-json-targeting": 1, - "fix-inconsistent-responsive-height-selection": 0, "flexAdSlots": 0.05, "intersect-resources": 0, "ios-fixed-no-transfer": 1, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index d4fe048b68a4..5ed82bc280ba 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -11,7 +11,6 @@ "doubleclickSraExp": 0.01, "doubleclickSraReportExcludedBlock": 0.1, "expand-json-targeting": 1, - "fix-inconsistent-responsive-height-selection": 0, "flexAdSlots": 0.05, "intersect-resources": 0, "ios-fixed-no-transfer": 0, diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js index fd79ad85e0aa..3c0ef1d97092 100644 --- a/tools/experiments/experiments-config.js +++ b/tools/experiments/experiments-config.js @@ -168,12 +168,6 @@ export const EXPERIMENTS = [ spec: 'https://github.com/ampproject/amphtml/issues/23568', cleanupIssue: 'https://github.com/ampproject/amphtml/issues/24165', }, - { - id: 'fix-inconsistent-responsive-height-selection', - name: 'Fix inconsistent responsive height selection.', - spec: 'https://github.com/ampproject/amphtml/issues/24166', - cleanupIssue: 'https://github.com/ampproject/amphtml/issues/24167', - }, { id: 'intersect-resources', name: 'Use IntersectionObserver for resource scheduling.', From 41ca30a32ffc1d01699b80663a6a4847914d25ba Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:49:08 +0000 Subject: [PATCH 6/7] (2017-05-16, ca2005971) `pump-early-frame`: 1 Previous history on prod-config.json: - ca2005971 - 2017-05-16T09:31:30-04:00 - Start Doubleclick Fast Fetch potential SRA delay measure experiment --- build-system/global-configs/canary-config.json | 3 +-- build-system/global-configs/prod-config.json | 3 +-- src/runtime.js | 2 +- test/unit/test-runtime.js | 4 ---- tools/experiments/experiments-config.js | 7 ------- 5 files changed, 3 insertions(+), 16 deletions(-) diff --git a/build-system/global-configs/canary-config.json b/build-system/global-configs/canary-config.json index 2400c00277ae..d3465ebbcb4c 100644 --- a/build-system/global-configs/canary-config.json +++ b/build-system/global-configs/canary-config.json @@ -1,6 +1,6 @@ { "allow-doc-opt-in": ["amp-next-page", "analytics-chunks-inabox"], - "allow-url-opt-in": ["pump-early-frame"], + "allow-url-opt-in": [], "amp-accordion-display-locking": 1, "canary": 1, "a4aProfilingRate": 0.01, @@ -15,7 +15,6 @@ "flexAdSlots": 0.05, "intersect-resources": 0, "ios-fixed-no-transfer": 1, - "pump-early-frame": 1, "remove-task-timeout": 0, "amp-ad-no-center-css": 0, "render-on-idle-fix": 1, diff --git a/build-system/global-configs/prod-config.json b/build-system/global-configs/prod-config.json index 5ed82bc280ba..da718cfbf2f1 100644 --- a/build-system/global-configs/prod-config.json +++ b/build-system/global-configs/prod-config.json @@ -1,6 +1,6 @@ { "allow-doc-opt-in": ["amp-next-page", "analytics-chunks-inabox"], - "allow-url-opt-in": ["pump-early-frame"], + "allow-url-opt-in": [], "canary": 0, "a4aProfilingRate": 0.01, "adsense-ad-size-optimization": 0.1, @@ -14,7 +14,6 @@ "flexAdSlots": 0.05, "intersect-resources": 0, "ios-fixed-no-transfer": 0, - "pump-early-frame": 1, "amp-ad-no-center-css": 0, "adsense-ptt-exp": 0.1, "doubleclick-ptt-exp": 0.1, diff --git a/src/runtime.js b/src/runtime.js index dc6a4ed7d4de..a21d6cfa970a 100644 --- a/src/runtime.js +++ b/src/runtime.js @@ -479,7 +479,7 @@ function maybeLoadCorrectVersion(win, fnOrStruct) { * pumped. */ function maybePumpEarlyFrame(win, cb) { - if (!isExperimentOn(win, 'pump-early-frame')) { + if (!(/* isExperimentOn(win, 'pump-early-frame') // launched: true */ true)) { cb(); return; } diff --git a/test/unit/test-runtime.js b/test/unit/test-runtime.js index a599a9e4f6c8..34b69645604c 100644 --- a/test/unit/test-runtime.js +++ b/test/unit/test-runtime.js @@ -33,7 +33,6 @@ import {installPlatformService} from '../../src/service/platform-impl'; import {installTimerService} from '../../src/service/timer-impl'; import {setShadowDomSupportedVersionForTesting} from '../../src/web-components'; import {toArray} from '../../src/types'; -import {toggleExperiment} from '../../src/experiments'; import {vsyncForTesting} from '../../src/service/vsync-impl'; describes.fakeWin( @@ -202,7 +201,6 @@ describes.fakeWin( ); it('should not maybePumpEarlyFrame when body not yet present', () => { - toggleExperiment(win, 'pump-early-frame', true); // Make document.body be null on first invocation to simulate // JS executing before the rest of the doc has been parsed. const {body} = win.document; @@ -223,14 +221,12 @@ describes.fakeWin( 'should not maybePumpEarlyFrame ' + 'when a renderDelayingExtension is present', () => { - toggleExperiment(win, 'pump-early-frame', true); win.document.body.appendChild(document.createElement('amp-experiment')); extensionRegistrationTest(); } ); it('should maybePumpEarlyFrame and delay extension execution', () => { - toggleExperiment(win, 'pump-early-frame', true); let progress = ''; const queueExtensions = win.AMP; const highPriority = regularExtension((amp) => { diff --git a/tools/experiments/experiments-config.js b/tools/experiments/experiments-config.js index 3c0ef1d97092..c485f9718fe4 100644 --- a/tools/experiments/experiments-config.js +++ b/tools/experiments/experiments-config.js @@ -81,13 +81,6 @@ export const EXPERIMENTS = [ spec: 'https://github.com/ampproject/amphtml/issues/22220', cleanupIssue: 'https://github.com/ampproject/amphtml/issues/22220', }, - { - id: 'pump-early-frame', - name: - 'If applicable, let the browser paint the current frame before ' + - 'executing the callback.', - cleanupIssue: 'https://github.com/ampproject/amphtml/issues/8237', - }, { id: 'web-worker', name: 'Web worker for background processing', From 0c80c7350168b98751a721cc880c768f938b1b49 Mon Sep 17 00:00:00 2001 From: lannka Date: Fri, 1 Jan 2021 00:49:08 +0000 Subject: [PATCH 7/7] =?UTF-8?q?=F0=9F=9A=AE=20Sweep=20experiments=20older?= =?UTF-8?q?=20than=202020-01-01?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sweep experiments last flipped globally up to 2020-01-01: - (2019-10-01, 0ab715ef1) `amp-action-macro`: 1 - (2018-11-05, d26327a3c) `amp-story-responsive-units`: 1 - (2018-07-11, 366b9d53e) `amp-story-v1`: 1 - (2018-07-11, 366b9d53e) `chunked-amp`: 1 - (2019-10-28, 4ca140956) `fix-inconsistent-responsive-height-selection`: 0 - (2017-05-16, ca2005971) `pump-early-frame`: 1 --- ### ⚠️ Javascript source files require intervention The following may contain errors and/or require intervention to remove superfluous conditionals: - `extensions/amp-action-macro/0.1/amp-action-macro.js` - `extensions/amp-action-macro/0.1/test/test-amp-action-macro.js` - `extensions/amp-story/1.0/test/test-amp-story.js` - `src/runtime.js` - `test/unit/test-runtime.js` Refer to the removal guide for [suggestions on handling these modified Javascript files.](https://github.com/ampproject/amphtml/blob/master/build-system/tasks/sweep-experiments/README.md#followup) --- ### ⚠️ HTML files may still contain references The following HTML files contain references to experiment names which may be stale and should be manually removed: - `examples/amp-action-macro.html` Refer to the removal guide for [suggestions on handling these HTML files.](https://github.com/ampproject/amphtml/blob/master/build-system/tasks/sweep-experiments/README.md#followup:html)