Skip to content

Commit

Permalink
🚮 Remove RENDLE_ON_IDLE experiment logic (#29661)
Browse files Browse the repository at this point in the history
* emove RENDLE_ON_IDLE experiment logic

* Update prod-config.json
  • Loading branch information
powerivq committed Sep 10, 2020
1 parent 95e9db0 commit 82af2f3
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 73 deletions.
7 changes: 0 additions & 7 deletions ads/google/a4a/utils.js
Expand Up @@ -47,13 +47,6 @@ const AmpAdImplementation = {
AMP_AD_IFRAME_GET: '5',
};

/** @const {!{id: string, control: string, experiment: string}} */
export const RENDER_ON_IDLE_FIX_EXP = {
id: 'render-on-idle-fix',
control: '21066311',
experiment: '21066312',
};

/** @const {!{id: string, control: string, experiment: string}} */
export const STICKY_AD_PADDING_BOTTOM_EXP = {
id: 'sticky-ad-padding-bottom',
Expand Down
3 changes: 1 addition & 2 deletions build-system/global-configs/prod-config.json
Expand Up @@ -36,6 +36,5 @@
"version-locking": 1,
"amp-ad-no-center-css": 0,
"analytics-chunks": 1,
"sticky-ad-padding-bottom": 1,
"render-on-idle-fix": 1
"sticky-ad-padding-bottom": 1
}
Expand Up @@ -26,7 +26,6 @@ import {CONSENT_POLICY_STATE} from '../../../src/consent-state';
import {Navigation} from '../../../src/service/navigation';
import {
QQID_HEADER,
RENDER_ON_IDLE_FIX_EXP,
SANDBOX_HEADER,
STICKY_AD_PADDING_BOTTOM_EXP,
ValidAdContainerTypes,
Expand Down Expand Up @@ -222,14 +221,6 @@ export class AmpAdNetworkAdsenseImpl extends AmpA4A {
*/
divertExperiments() {
const experimentInfoList = /** @type {!Array<!../../../src/experiments.ExperimentInfo>} */ ([
{
experimentId: RENDER_ON_IDLE_FIX_EXP.id,
isTrafficEligible: () => true,
branches: [
RENDER_ON_IDLE_FIX_EXP.control,
RENDER_ON_IDLE_FIX_EXP.experiment,
],
},
{
experimentId: NO_SIGNING_EXP.id,
isTrafficEligible: () => true,
Expand Down
Expand Up @@ -32,7 +32,6 @@ import {
import {
AmpAnalyticsConfigDef,
QQID_HEADER,
RENDER_ON_IDLE_FIX_EXP,
SANDBOX_HEADER,
STICKY_AD_PADDING_BOTTOM_EXP,
ValidAdContainerTypes,
Expand Down Expand Up @@ -429,14 +428,6 @@ export class AmpAdNetworkDoubleclickImpl extends AmpA4A {
isTrafficEligible: () => true,
branches: Object.values(ZINDEX_EXP_BRANCHES),
},
{
experimentId: RENDER_ON_IDLE_FIX_EXP.id,
isTrafficEligible: () => true,
branches: [
RENDER_ON_IDLE_FIX_EXP.control,
RENDER_ON_IDLE_FIX_EXP.experiment,
],
},
{
experimentId: NO_SIGNING_EXP.id,
isTrafficEligible: () => true,
Expand Down
48 changes: 2 additions & 46 deletions src/service/resources-impl.js
Expand Up @@ -26,17 +26,13 @@ import {VisibilityState} from '../visibility-state';
import {dev, devAssert} from '../log';
import {dict} from '../utils/object';
import {expandLayoutRect} from '../layout-rect';
import {
getExperimentBranch,
isExperimentOn,
randomlySelectUnsetExperiments,
} from '../experiments';
import {getMode} from '../mode';
import {getSourceUrl} from '../url';
import {hasNextNodeInDocumentOrder, isIframed} from '../dom';
import {ieIntrinsicCheckAndFix} from './ie-intrinsic-bug';
import {ieMediaCheckAndFix} from './ie-media-bug';
import {isBlockedByConsent, reportError} from '../error';
import {isExperimentOn} from '../experiments';
import {listen, loadPromise} from '../event-helper';
import {registerServiceBuilderForDoc} from '../service';
import {remove} from '../utils/array';
Expand All @@ -56,13 +52,6 @@ const FOCUS_HISTORY_TIMEOUT_ = 1000 * 60; // 1min
const FOUR_FRAME_DELAY_ = 70;
const MAX_BUILD_CHUNK_SIZE = 10;

/** @const {!{id: string, control: string, experiment: string}} */
const RENDER_ON_IDLE_FIX_EXP = {
id: 'render-on-idle-fix',
control: '21066311',
experiment: '21066312',
};

/**
* @implements {ResourcesInterface}
*/
Expand Down Expand Up @@ -208,15 +197,9 @@ export class ResourcesImpl {
/** @const @private {boolean} */
this.buildInChunks_ = isExperimentOn(this.win, 'build-in-chunks');

/** @const @private {boolean} */
this.renderOnIdleFix_ = isExperimentOn(this.win, 'render-on-idle-fix');

/** @const @private {boolean} */
this.removeTaskTimeout_ = isExperimentOn(this.win, 'remove-task-timeout');

/** @private {boolean} */
this.divertedRenderOnIdleFixExperiment_ = false;

/** @const @private {!Deferred} */
this.firstPassDone_ = new Deferred();

Expand Down Expand Up @@ -1190,28 +1173,6 @@ export class ResourcesImpl {
}
}

/**
* Selects into an experiment for render-on-idle-fix.
* @private
*/
divertRenderOnIdleFixExperiment_() {
if (this.divertedRenderOnIdleFixExperiment_) {
return;
}
this.divertedRenderOnIdleFixExperiment_ = true;
const experimentInfoList = /** @type {!Array<!../experiments.ExperimentInfo>} */ ([
{
experimentId: RENDER_ON_IDLE_FIX_EXP.id,
isTrafficEligible: () => true,
branches: [
RENDER_ON_IDLE_FIX_EXP.control,
RENDER_ON_IDLE_FIX_EXP.experiment,
],
},
]);
randomlySelectUnsetExperiments(this.win, experimentInfoList);
}

/**
* Discovers work that needs to be done since the last pass. If viewport
* has changed, it will try to build new elements, measure changed elements,
Expand Down Expand Up @@ -1479,17 +1440,12 @@ export class ResourcesImpl {
* @private
*/
isIdle_(now = Date.now()) {
this.divertRenderOnIdleFixExperiment_();
const lastDequeueTime = this.exec_.getLastDequeueTime();
return (
this.exec_.getSize() == 0 &&
this.queue_.getSize() == 0 &&
now > lastDequeueTime + 5000 &&
(lastDequeueTime > 0 ||
// TODO(powerivq): add tests for this fix once ready to launch
!this.renderOnIdleFix_ ||
getExperimentBranch(this.win, RENDER_ON_IDLE_FIX_EXP.id) ===
RENDER_ON_IDLE_FIX_EXP.control)
lastDequeueTime > 0
);
}

Expand Down

0 comments on commit 82af2f3

Please sign in to comment.