prebid.js 7.14.0 → 7.16.0

package/modules/userId/index.js

@@ -154,6 +154,7 @@ import {
 import {getPPID as coreGetPPID} from '../../src/adserver.js';
 import {defer, GreedyPromise} from '../../src/utils/promise.js';
 import {hasPurpose1Consent} from '../../src/utils/gpdr.js';
+import {newMetrics, timedAuctionHook, useMetrics} from '../../src/utils/perfMetrics.js';
 
 const MODULE_NAME = 'User ID';
 const COOKIE = 'cookie';
@@ -196,6 +197,20 @@ let ppidSource;
 
 let configListener;
 
+const uidMetrics = (() => {
+  let metrics;
+  return () => {
+    if (metrics == null) {
+      metrics = newMetrics();
+    }
+    return metrics;
+  }
+})();
+
+function submoduleMetrics(moduleName) {
+  return uidMetrics().fork().renameWith(n => [`userId.mod.${n}`, `userId.mods.${moduleName}.${n}`])
+}
+
 /** @param {Submodule[]} submodules */
 export function setSubmoduleRegistry(submodules) {
   submoduleRegistry = submodules;
@@ -395,14 +410,13 @@ export function findRootDomain(fullDomain = window.location.hostname) {
  * @param {function} cb - callback for after processing is done.
  */
 function processSubmoduleCallbacks(submodules, cb) {
-  let done = () => {};
-  if (cb) {
-    done = delayExecution(() => {
-      clearTimeout(timeoutID);
-      cb();
-    }, submodules.length);
-  }
+  cb = uidMetrics().fork().startTiming('userId.callbacks.total').stopBefore(cb);
+  const done = delayExecution(() => {
+    clearTimeout(timeoutID);
+    cb();
+  }, submodules.length);
   submodules.forEach(function (submodule) {
+    const moduleDone = submoduleMetrics(submodule.submodule.name).startTiming('callback').stopBefore(done);
     function callbackCompleted(idObj) {
       // if valid, id data should be saved to cookie/html storage
       if (idObj) {
@@ -414,13 +428,13 @@ function processSubmoduleCallbacks(submodules, cb) {
       } else {
         logInfo(`${MODULE_NAME}: ${submodule.submodule.name} - request id responded with an empty value`);
       }
-      done();
+      moduleDone();
     }
     try {
       submodule.callback(callbackCompleted);
     } catch (e) {
       logError(`Error in userID module '${submodule.submodule.name}':`, e);
-      done();
+      moduleDone();
     }
     // clear callback, this prop is used to test if all submodule callbacks are complete below
     submodule.callback = undefined;
@@ -508,13 +522,16 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
   const startCallbacks = defer();
   let cancel;
   let initialized = false;
+  let initMetrics;
 
   function cancelAndTry(promise) {
+    initMetrics = uidMetrics().fork();
     if (cancel != null) {
       cancel.reject(INIT_CANCELED);
     }
     cancel = defer();
-    return GreedyPromise.race([promise, cancel.promise]);
+    return GreedyPromise.race([promise, cancel.promise])
+      .finally(initMetrics.startTiming('userId.total'))
   }
 
   // grab a reference to global vars so that the promise chains remain isolated;
@@ -532,13 +549,17 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
     }
   }
 
+  function timeGdpr() {
+    return gdprDataHandler.promise.finally(initMetrics.startTiming('userId.init.gdpr'));
+  }
+
   let done = cancelAndTry(
     GreedyPromise.all([hooksReady, startInit.promise])
-      .then(() => gdprDataHandler.promise)
+      .then(timeGdpr)
       .then(checkRefs((consentData) => {
         initSubmodules(initModules, allModules, consentData);
       }))
-      .then(() => startCallbacks.promise)
+      .then(() => startCallbacks.promise.finally(initMetrics.startTiming('userId.callbacks.pending')))
       .then(checkRefs(() => {
         const modWithCb = initModules.filter(item => isFn(item.callback));
         if (modWithCb.length) {
@@ -570,7 +591,7 @@ function idSystemInitializer({delay = GreedyPromise.timeout} = {}) {
       done = cancelAndTry(
         done
           .catch(() => null)
-          .then(() => gdprDataHandler.promise) // fetch again in case a refresh was forced before this was resolved
+          .then(timeGdpr) // fetch again in case a refresh was forced before this was resolved
           .then(checkRefs((consentData) => {
             const cbModules = initSubmodules(
               initModules,
@@ -614,7 +635,7 @@ function getPPID() {
  * @param {Object} reqBidsConfigObj required; This is the same param that's used in pbjs.requestBids.
  * @param {function} fn required; The next function in the chain, used by hook.js
  */
-export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
+export const requestBidsHook = timedAuctionHook('userId', function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.timeout, getIds = getUserIdsAsync} = {}) {
   GreedyPromise.race([
     getIds().catch(() => null),
     delay(auctionDelay)
@@ -633,11 +654,11 @@ export function requestBidsHook(fn, reqBidsConfigObj, {delay = GreedyPromise.tim
         });
       }
     }
-
+    uidMetrics().join(useMetrics(reqBidsConfigObj.metrics), {propagate: false, includeGroups: true});
     // calling fn allows prebid to continue processing
     fn.call(this, reqBidsConfigObj);
   });
-}
+});
 
 /**
  * This function will be exposed in global-name-space so that userIds stored by Prebid UserId module can be used by external codes as well.
@@ -835,43 +856,47 @@ function populateSubmoduleId(submodule, consentData, storedConsentData, forceRef
 }
 
 function initSubmodules(dest, submodules, consentData, forceRefresh = false) {
-  if (!submodules.length) return []; // to simplify log messages from here on
+  return uidMetrics().fork().measureTime('userId.init.modules', function () {
+    if (!submodules.length) return []; // to simplify log messages from here on
 
-  // filter out submodules whose storage type is not enabled
-  // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
-  const storageTypes = getActiveStorageTypes();
-  submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
-
-  if (!submodules.length) {
-    logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
-    return [];
-  }
+    // filter out submodules whose storage type is not enabled
+    // this needs to be done here (after consent data has loaded) so that enforcement may disable storage globally
+    const storageTypes = getActiveStorageTypes();
+    submodules = submodules.filter((submod) => !submod.config.storage || storageTypes.has(submod.config.storage.type));
 
-  // another consent check, this time each module is checked for consent with its own gvlid
-  let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
-  if (!hasValidated && !hasPurpose1Consent(consentData)) {
-    logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
-    return [];
-  }
+    if (!submodules.length) {
+      logWarn(`${MODULE_NAME} - no ID module is configured for one of the available storage types:`, Array.from(storageTypes));
+      return [];
+    }
 
-  // we always want the latest consentData stored, even if we don't execute any submodules
-  const storedConsentData = getStoredConsentData();
-  setStoredConsentData(consentData);
+    // another consent check, this time each module is checked for consent with its own gvlid
+    let { userIdModules, hasValidated } = validateGdprEnforcement(submodules, consentData);
+    if (!hasValidated && !hasPurpose1Consent(consentData)) {
+      logWarn(`${MODULE_NAME} - gdpr permission not valid for local storage or cookies, exit module`);
+      return [];
+    }
 
-  const initialized = userIdModules.reduce((carry, submodule) => {
-    try {
-      populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
-      carry.push(submodule);
-    } catch (e) {
-      logError(`Error in userID module '${submodule.submodule.name}':`, e);
+    // we always want the latest consentData stored, even if we don't execute any submodules
+    const storedConsentData = getStoredConsentData();
+    setStoredConsentData(consentData);
+
+    const initialized = userIdModules.reduce((carry, submodule) => {
+      return submoduleMetrics(submodule.submodule.name).measureTime('init', () => {
+        try {
+          populateSubmoduleId(submodule, consentData, storedConsentData, forceRefresh);
+          carry.push(submodule);
+        } catch (e) {
+          logError(`Error in userID module '${submodule.submodule.name}':`, e);
+        }
+        return carry;
+      })
+    }, []);
+    if (initialized.length) {
+      setPrebidServerEidPermissions(initialized);
     }
-    return carry;
-  }, []);
-  if (initialized.length) {
-    setPrebidServerEidPermissions(initialized);
-  }
-  initialized.forEach(updateInitializedSubmodules.bind(null, dest));
-  return initialized;
+    initialized.forEach(updateInitializedSubmodules.bind(null, dest));
+    return initialized;
+  })
 }
 
 function updateInitializedSubmodules(dest, submodule) {

package/modules/viewability.js

@@ -1,177 +1,9 @@
-import {insertHtmlIntoIframe, isFn, isStr, logInfo, logWarn, triggerPixel} from '../src/utils.js';
-import {getGlobal} from '../src/prebidGlobal.js';
-import {find} from '../src/polyfill.js';
+import {logWarn} from '../src/utils.js';
 
 export const MODULE_NAME = 'viewability';
 
 export function init() {
-  (getGlobal()).viewability = {
-    startMeasurement: startMeasurement,
-    stopMeasurement: stopMeasurement,
-  };
-
-  listenMessagesFromCreative();
-}
-
-const observers = new Map();
-
-function isValid(vid, element, tracker, criteria) {
-  if (!element) {
-    logWarn(`${MODULE_NAME}: no html element provided`);
-    return false;
-  }
-
-  let validTracker = tracker &&
-    ((tracker.method === 'img' && isStr(tracker.value)) ||
-    (tracker.method === 'js' && isStr(tracker.value)) ||
-    (tracker.method === 'callback' && isFn(tracker.value)));
-
-  if (!validTracker) {
-    logWarn(`${MODULE_NAME}: invalid tracker`, tracker);
-    return false;
-  }
-
-  if (!criteria || !criteria.inViewThreshold || !criteria.timeInView) {
-    logWarn(`${MODULE_NAME}: missing criteria`, criteria);
-    return false;
-  }
-
-  if (!vid || observers.has(vid)) {
-    logWarn(`${MODULE_NAME}: must provide an unregistered vid`, vid);
-    return false;
-  }
-
-  return true;
-}
-
-function stopObserving(observer, vid, element) {
-  observer.unobserve(element);
-  observers.get(vid).done = true;
-}
-
-function fireViewabilityTracker(element, tracker) {
-  switch (tracker.method) {
-    case 'img':
-      triggerPixel(tracker.value, () => {
-        logInfo(`${MODULE_NAME}: viewability pixel fired`, tracker.value);
-      });
-      break;
-    case 'js':
-      insertHtmlIntoIframe(`<script src="${tracker.value}"></script>`);
-      break;
-    case 'callback':
-      tracker.value(element);
-      break;
-  }
-}
-
-function viewabilityCriteriaMet(observer, vid, element, tracker) {
-  stopObserving(observer, vid, element);
-  fireViewabilityTracker(element, tracker);
-}
-
-/**
- * Start measuring viewability of an element
- * @typedef {{ method: string='img','js','callback', value: string|function }} ViewabilityTracker { method: 'img', value: 'http://my.tracker/123' }
- * @typedef {{ inViewThreshold: number, timeInView: number }} ViewabilityCriteria { inViewThreshold: 0.5, timeInView: 1000 }
- * @param {string} vid unique viewability identifier
- * @param {HTMLElement} element
- * @param {ViewabilityTracker} tracker
- * @param {ViewabilityCriteria} criteria
- */
-export function startMeasurement(vid, element, tracker, criteria) {
-  if (!isValid(vid, element, tracker, criteria)) {
-    return;
-  }
-
-  const options = {
-    root: null,
-    rootMargin: '0px',
-    threshold: criteria.inViewThreshold,
-  };
-
-  let observer;
-  let viewable = false;
-  let stateChange = (entries) => {
-    viewable = entries[0].isIntersecting;
-
-    if (viewable) {
-      observers.get(vid).timeoutId = window.setTimeout(() => {
-        viewabilityCriteriaMet(observer, vid, element, tracker);
-      }, criteria.timeInView);
-    } else if (observers.get(vid).timeoutId) {
-      window.clearTimeout(observers.get(vid).timeoutId);
-    }
-  };
-
-  observer = new IntersectionObserver(stateChange, options);
-  observers.set(vid, {
-    observer: observer,
-    element: element,
-    timeoutId: null,
-    done: false,
-  });
-
-  observer.observe(element);
-
-  logInfo(`${MODULE_NAME}: startMeasurement called with:`, arguments);
-}
-
-/**
- * Stop measuring viewability of an element
- * @param {string} vid unique viewability identifier
- */
-export function stopMeasurement(vid) {
-  if (!vid || !observers.has(vid)) {
-    logWarn(`${MODULE_NAME}: must provide a registered vid`, vid);
-    return;
-  }
-
-  observers.get(vid).observer.unobserve(observers.get(vid).element);
-  if (observers.get(vid).timeoutId) {
-    window.clearTimeout(observers.get(vid).timeoutId);
-  }
-
-  // allow the observer under this vid to be created again
-  if (!observers.get(vid).done) {
-    observers.delete(vid);
-  }
-}
-
-function listenMessagesFromCreative() {
-  window.addEventListener('message', receiveMessage, false);
-}
-
-/**
- * Recieve messages from creatives
- * @param {MessageEvent} evt
- */
-export function receiveMessage(evt) {
-  var key = evt.message ? 'message' : 'data';
-  var data = {};
-  try {
-    data = JSON.parse(evt[key]);
-  } catch (e) {
-    return;
-  }
-
-  if (!data || data.message !== 'Prebid Viewability') {
-    return;
-  }
-
-  switch (data.action) {
-    case 'startMeasurement':
-      let element = data.elementId && document.getElementById(data.elementId);
-      if (!element) {
-        element = find(document.getElementsByTagName('IFRAME'), iframe => (iframe.contentWindow || iframe.contentDocument.defaultView) == evt.source);
-      }
-
-      startMeasurement(data.vid, element, data.tracker, data.criteria);
-      break;
-    case 'stopMeasurement':
-      stopMeasurement(data.vid);
-      break;
-  }
+  logWarn('Viewability module should not be used. See https://github.com/prebid/Prebid.js/issues/8928');
 }
 
 init();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prebid.js",
-  "version": "7.14.0",
+  "version": "7.16.0",
   "description": "Header Bidding Management Library",
   "main": "src/prebid.js",
   "scripts": {
@@ -67,7 +67,7 @@
     "gulp-clean": "^0.3.2",
     "gulp-concat": "^2.6.0",
     "gulp-connect": "^5.7.0",
-    "gulp-eslint": "^4.0.0",
+    "gulp-eslint": "^6.0.0",
     "gulp-if": "^3.0.0",
     "gulp-js-escape": "^1.0.1",
     "gulp-replace": "^1.0.0",
@@ -122,7 +122,7 @@
     "criteo-direct-rsa-validate": "^1.1.0",
     "crypto-js": "^3.3.0",
     "dlv": "1.1.3",
-    "dset": "2.0.1",
+    "dset": "3.1.2",
     "express": "^4.15.4",
     "fun-hooks": "^0.9.9",
     "just-clone": "^1.0.2",

package/src/adapterManager.js

@@ -17,22 +17,24 @@ import {
   logError,
   logInfo,
   logMessage,
-  logWarn, mergeDeep,
+  logWarn,
+  mergeDeep,
   shuffle,
   timestamp,
 } from './utils.js';
 import {processAdUnitsForLabels} from './sizeMapping.js';
-import { decorateAdUnitsWithNativeParams, nativeAdapters } from './native.js';
-import { newBidder } from './adapters/bidderFactory.js';
-import { ajaxBuilder } from './ajax.js';
-import { config, RANDOM } from './config.js';
-import { hook } from './hook.js';
-import {includes, find} from './polyfill.js';
-import { adunitCounter } from './adUnits.js';
-import { getRefererInfo } from './refererDetection.js';
+import {decorateAdUnitsWithNativeParams, nativeAdapters} from './native.js';
+import {newBidder} from './adapters/bidderFactory.js';
+import {ajaxBuilder} from './ajax.js';
+import {config, RANDOM} from './config.js';
+import {hook} from './hook.js';
+import {find, includes} from './polyfill.js';
+import {adunitCounter} from './adUnits.js';
+import {getRefererInfo} from './refererDetection.js';
 import {GdprConsentHandler, UspConsentHandler} from './consentHandler.js';
 import * as events from './events.js';
 import CONSTANTS from './constants.json';
+import {useMetrics} from './utils/perfMetrics.js';
 
 export const PARTITIONS = {
   CLIENT: 'client',
@@ -60,7 +62,7 @@ var _analyticsRegistry = {};
  * @property {Array<string>} activeLabels the labels specified as being active by requestBids
  */
 
-function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src}) {
+function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src, metrics}) {
   return adUnits.reduce((result, adUnit) => {
     result.push(adUnit.bids.filter(bid => bid.bidder === bidderCode)
       .reduce((bids, bid) => {
@@ -92,6 +94,7 @@ function getBids({bidderCode, auctionId, bidderRequestId, adUnits, src}) {
           bidderRequestId,
           auctionId,
           src,
+          metrics,
           bidRequestsCount: adunitCounter.getRequestsCounter(adUnit.code),
           bidderRequestsCount: adunitCounter.getBidderRequestsCounter(adUnit.code, bid.bidder),
           bidderWinsCount: adunitCounter.getBidderWinsCounter(adUnit.code, bid.bidder),
@@ -206,7 +209,8 @@ export function _partitionBidders (adUnits, s2sConfigs, {getS2SBidders = getS2SB
 
 export const partitionBidders = hook('sync', _partitionBidders, 'partitionBidders');
 
-adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels, ortb2Fragments = {}) {
+adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, auctionId, cbTimeout, labels, ortb2Fragments = {}, auctionMetrics) {
+  auctionMetrics = useMetrics(auctionMetrics);
   /**
    * emit and pass adunits for external modification
    * @see {@link https://github.com/prebid/Prebid.js/issues/4149|Issue}
@@ -244,16 +248,18 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
       let uniquePbsTid = generateUUID();
       serverBidders.forEach(bidderCode => {
         const bidderRequestId = getUniqueIdentifierStr();
+        const metrics = auctionMetrics.fork();
         const bidderRequest = addOrtb2({
           bidderCode,
           auctionId,
           bidderRequestId,
           uniquePbsTid,
-          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC}),
+          bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsS2SCopy), src: CONSTANTS.S2S.SRC, metrics}),
           auctionStart: auctionStart,
           timeout: s2sConfig.timeout,
           src: CONSTANTS.S2S.SRC,
           refererInfo,
+          metrics,
         });
         if (bidderRequest.bids.length !== 0) {
           bidRequests.push(bidderRequest);
@@ -281,14 +287,16 @@ adapterManager.makeBidRequests = hook('sync', function (adUnits, auctionStart, a
   let adUnitsClientCopy = getAdUnitCopyForClientAdapters(adUnits);
   clientBidders.forEach(bidderCode => {
     const bidderRequestId = getUniqueIdentifierStr();
+    const metrics = auctionMetrics.fork();
     const bidderRequest = addOrtb2({
       bidderCode,
       auctionId,
       bidderRequestId,
-      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsClientCopy), labels, src: 'client'}),
+      bids: hookedGetBids({bidderCode, auctionId, bidderRequestId, 'adUnits': deepClone(adUnitsClientCopy), labels, src: 'client', metrics}),
       auctionStart: auctionStart,
       timeout: cbTimeout,
       refererInfo,
+      metrics,
     });
     const adapter = _bidderRegistry[bidderCode];
     if (!adapter) {

package/src/adapters/bidderFactory.js

@@ -15,6 +15,7 @@ import { getHook, hook } from '../hook.js';
 import { getCoreStorageManager } from '../storageManager.js';
 import {auctionManager} from '../auctionManager.js';
 import { bidderSettings } from '../bidderSettings.js';
+import {useMetrics} from '../utils/perfMetrics.js';
 
 export const storage = getCoreStorageManager('bidderFactory');
 
@@ -196,8 +197,10 @@ export function newBidder(spec) {
 
       const adUnitCodesHandled = {};
       function addBidWithCode(adUnitCode, bid) {
+        const metrics = useMetrics(bid.metrics);
+        metrics.checkpoint('addBidResponse');
         adUnitCodesHandled[adUnitCode] = true;
-        if (isValid(adUnitCode, bid)) {
+        if (metrics.measureTime('addBidResponse.validate', () => isValid(adUnitCode, bid))) {
           addBidResponse(adUnitCode, bid);
         }
       }
@@ -213,7 +216,9 @@ export function newBidder(spec) {
         });
       }
 
-      const validBidRequests = bidderRequest.bids.filter(filterAndWarn);
+      const validBidRequests = adapterMetrics(bidderRequest)
+        .measureTime('validate', () => bidderRequest.bids.filter(filterAndWarn));
+
       if (validBidRequests.length === 0) {
         afterAllResponses();
         return;
@@ -315,7 +320,11 @@ export function newBidder(spec) {
  * @param onCompletion {function()} invoked once when all bid requests have been processed
  */
 export const processBidderRequests = hook('sync', function (spec, bids, bidderRequest, ajax, wrapCallback, {onRequest, onResponse, onFledgeAuctionConfigs, onError, onBid, onCompletion}) {
-  let requests = spec.buildRequests(bids, bidderRequest);
+  const metrics = adapterMetrics(bidderRequest);
+  onCompletion = metrics.startTiming('total').stopBefore(onCompletion);
+
+  let requests = metrics.measureTime('buildRequests', () => spec.buildRequests(bids, bidderRequest));
+
   if (!requests || requests.length === 0) {
     onCompletion();
     return;
@@ -327,10 +336,16 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
   const requestDone = delayExecution(onCompletion, requests.length);
 
   requests.forEach((request) => {
+    const requestMetrics = metrics.fork();
+    function addBid(bid) {
+      if (bid != null) bid.metrics = requestMetrics.fork().renameWith();
+      onBid(bid);
+    }
     // If the server responds successfully, use the adapter code to unpack the Bids from it.
     // If the adapter code fails, no bids should be added. After all the bids have been added,
     // make sure to call the `requestDone` function so that we're one step closer to calling onCompletion().
     const onSuccess = wrapCallback(function(response, responseObj) {
+      networkDone();
       try {
         response = JSON.parse(response);
       } catch (e) { /* response might not be JSON... that's ok. */ }
@@ -343,7 +358,7 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
       onResponse(response);
 
       try {
-        response = spec.interpretResponse(response, request);
+        response = requestMetrics.measureTime('interpretResponse', () => spec.interpretResponse(response, request));
       } catch (err) {
         logError(`Bidder ${spec.code} failed to interpret the server's response. Continuing without bids`, null, err);
         requestDone();
@@ -361,9 +376,9 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
 
       if (bids) {
         if (isArray(bids)) {
-          bids.forEach(onBid);
+          bids.forEach(addBid);
         } else {
-          onBid(bids);
+          addBid(bids);
         }
       }
       requestDone();
@@ -376,11 +391,14 @@ export const processBidderRequests = hook('sync', function (spec, bids, bidderRe
     });
 
     const onFailure = wrapCallback(function (errorMessage, error) {
+      networkDone();
       onError(errorMessage, error);
       requestDone();
     });
 
     onRequest(request);
+
+    const networkDone = requestMetrics.startTiming('net');
     switch (request.method) {
       case 'GET':
         ajax(
@@ -588,3 +606,7 @@ export function isValid(adUnitCode, bid, {index = auctionManager.index} = {}) {
 
   return true;
 }
+
+function adapterMetrics(bidderRequest) {
+  return useMetrics(bidderRequest.metrics).renameWith(n => [`adapter.client.${n}`, `adapters.client.${bidderRequest.bidderCode}.${n}`])
+}