display bidder in utils.logs and disable bidder config on auction end (…

…prebid#6683)
indexexchange · May 6, 2021 · 9c7deef · 9c7deef
1 parent 335edb5
commit 9c7deef
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/src/adapterManager.js b/src/adapterManager.js
@@ -417,8 +417,10 @@ adapterManager.callBids = (adUnits, bidRequests, addBidResponse, doneCb, request
     bidRequest.start = timestamp();
     // TODO : Do we check for bid in pool from here and skip calling adapter again ?
     const adapter = _bidderRegistry[bidRequest.bidderCode];
-    utils.logMessage(`CALLING BIDDER ======= ${bidRequest.bidderCode}`);
-    events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    config.runWithBidder(bidRequest.bidderCode, () => {
+      utils.logMessage(`CALLING BIDDER`);
+      events.emit(CONSTANTS.EVENTS.BID_REQUESTED, bidRequest);
+    });
     let ajax = ajaxBuilder(requestBidsTimeout, requestCallbacks ? {
       request: requestCallbacks.request.bind(null, bidRequest.bidderCode),
       done: requestCallbacks.done

diff --git a/src/adapters/bidderFactory.js b/src/adapters/bidderFactory.js
@@ -197,8 +197,10 @@ export function newBidder(spec) {
       const responses = [];
       function afterAllResponses() {
         done();
-        events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
-        registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
+        config.runWithBidder(spec.code, () => {
+          events.emit(CONSTANTS.EVENTS.BIDDER_DONE, bidderRequest);
+          registerSyncs(responses, bidderRequest.gdprConsent, bidderRequest.uspConsent);
+        });
       }
 
       const validBidRequests = bidderRequest.bids.filter(filterAndWarn);

diff --git a/src/auction.js b/src/auction.js
@@ -197,6 +197,7 @@ export function newAuction({adUnits, adUnitCodes, callback, cbTimeout, labels, a
   }
 
   function auctionDone() {
+    config.resetBidder();
     // when all bidders have called done callback atleast once it means auction is complete
     utils.logInfo(`Bids Received for Auction with id: ${_auctionId}`, _bidsReceived);
     _auctionStatus = AUCTION_COMPLETED;

diff --git a/src/config.js b/src/config.js
@@ -595,7 +595,7 @@ export function newConfig() {
     try {
       return fn();
     } finally {
-      currBidder = null;
+      resetBidder();
     }
   }
   function callbackWithBidder(bidder) {
@@ -614,10 +614,15 @@ export function newConfig() {
     return currBidder;
   }
 
+  function resetBidder() {
+    currBidder = null;
+  }
+
   resetConfig();
 
   return {
     getCurrentBidder,
+    resetBidder,
     getConfig,
     setConfig,
     setDefaults,

diff --git a/src/utils.js b/src/utils.js
@@ -276,10 +276,19 @@ export function logError() {
 
 function decorateLog(args, prefix) {
   args = [].slice.call(args);
+  let bidder = config.getCurrentBidder();
+
   prefix && args.unshift(prefix);
-  args.unshift('display: inline-block; color: #fff; background: #3b88c3; padding: 1px 4px; border-radius: 3px;');
-  args.unshift('%cPrebid');
+  if (bidder) {
+    args.unshift(label('#aaa'));
+  }
+  args.unshift(label('#3b88c3'));
+  args.unshift('%cPrebid' + (bidder ? `%c${bidder}` : ''));
   return args;
+
+  function label(color) {
+    return `display: inline-block; color: #fff; background: ${color}; padding: 1px 4px; border-radius: 3px;`
+  }
 }
 
 export function hasConsoleLogger() {