9789 tmax/timeout set to value from bidderRequest (prebid#11469)

Co-authored-by: mkomorski <marcin.komorski@gmail.com> Co-authored-by: Demetrio Girardi <dgirardi@prebid.org>
ebuzzing · May 10, 2024 · 37ab555 · 37ab555
1 parent ef42add
commit 37ab555
Show file tree

Hide file tree

Showing 14 changed files with 18 additions and 17 deletions.
diff --git a/modules/advangelistsBidAdapter.js b/modules/advangelistsBidAdapter.js
@@ -236,7 +236,7 @@ function createVideoRequestData(bid, bidderRequest) {
     },
     'at': 2,
     'site': {},
-    'tmax': 3000,
+    'tmax': Math.min(3000, bidderRequest.timeout),
     'cur': ['USD'],
     'id': bid.bidId,
     'imp': [],
@@ -322,7 +322,7 @@ function createBannerRequestData(bid, bidderRequest) {
     },
     'at': 2,
     'site': {},
-    'tmax': 3000,
+    'tmax': Math.min(3000, bidderRequest.timeout),
     'cur': ['USD'],
     'id': bid.bidId,
     'imp': [],

diff --git a/modules/axonixBidAdapter.js b/modules/axonixBidAdapter.js
@@ -120,7 +120,7 @@ export const spec = {
         prebidVersion: '$prebid.version$',
         screenHeight: screen.height,
         screenWidth: screen.width,
-        tmax: config.getConfig('bidderTimeout'),
+        tmax: bidderRequest.timeout,
         ua: navigator.userAgent,
       };
 

diff --git a/modules/bluebillywigBidAdapter.js b/modules/bluebillywigBidAdapter.js
@@ -278,7 +278,7 @@ export const spec = {
     const request = {
       id: bidderRequest.bidderRequestId,
       source: {tid: bidderRequest.ortb2?.source?.tid},
-      tmax: BB_CONSTANTS.DEFAULT_TIMEOUT,
+      tmax: Math.min(BB_CONSTANTS.DEFAULT_TIMEOUT, bidderRequest.timeout),
       imp: imps,
       test: DEV_MODE ? 1 : 0,
       ext: {

diff --git a/modules/brightMountainMediaBidAdapter.js b/modules/brightMountainMediaBidAdapter.js
@@ -31,7 +31,7 @@ export const spec = {
       site: buildSite(bidderRequest),
       device: buildDevice(),
       cur: [CURRENCY],
-      tmax: 1000,
+      tmax: Math.min(1000, bidderRequest.timeout),
       regs: buildRegs(bidderRequest),
       user: {},
       source: {},

diff --git a/modules/lkqdBidAdapter.js b/modules/lkqdBidAdapter.js
@@ -67,7 +67,7 @@ export const spec = {
         },
         test: 0,
         at: 2,
-        tmax: bid.params.timeout || config.getConfig('bidderTimeout') || 100,
+        tmax: bidderRequest.timeout,
         cur: ['USD'],
         regs: {
           ext: {

diff --git a/modules/mgidXBidAdapter.js b/modules/mgidXBidAdapter.js
@@ -166,7 +166,7 @@ export const spec = {
       placements,
       coppa: config.getConfig('coppa') === true ? 1 : 0,
       ccpa: bidderRequest.uspConsent || undefined,
-      tmax: config.getConfig('bidderTimeout')
+      tmax: bidderRequest.timeout
     };
 
     if (bidderRequest.gdprConsent) {

diff --git a/modules/oguryBidAdapter.js b/modules/oguryBidAdapter.js
@@ -81,7 +81,7 @@ function getUserSyncs(syncOptions, serverResponses, gdprConsent, uspConsent) {
 function buildRequests(validBidRequests, bidderRequest) {
   const openRtbBidRequestBanner = {
     id: bidderRequest.bidderRequestId,
-    tmax: DEFAULT_TIMEOUT,
+    tmax: Math.min(DEFAULT_TIMEOUT, bidderRequest.timeout),
     at: 1,
     regs: {
       ext: {

diff --git a/modules/rhythmoneBidAdapter.js b/modules/rhythmoneBidAdapter.js
@@ -161,7 +161,7 @@ function RhythmOneBidAdapter() {
         }
       },
       at: 1,
-      tmax: 1000,
+      tmax: Math.min(1000, bidderRequest.timeout),
       regs: {
         ext: {
           gdpr: deepAccess(bidderRequest, 'gdprConsent.gdprApplies') ? Boolean(bidderRequest.gdprConsent.gdprApplies & 1) : false

diff --git a/modules/visxBidAdapter.js b/modules/visxBidAdapter.js
@@ -114,8 +114,7 @@ export const spec = {
       }
     }
 
-    const bidderTimeout = Number(config.getConfig('bidderTimeout')) || timeout;
-    const tmax = timeout ? Math.min(bidderTimeout, timeout) : bidderTimeout;
+    const tmax = timeout;
     const source = {
       ext: {
         wrapperType: 'Prebid_js',

diff --git a/test/spec/modules/advangelistsBidAdapter_spec.js b/test/spec/modules/advangelistsBidAdapter_spec.js
@@ -44,19 +44,19 @@ describe('advangelistsBidAdapter', function () {
   describe('spec.buildRequests', function () {
     it('should create a POST request for each bid', function () {
       const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].method).to.equal('POST');
     });
 
     it('should create a POST request for each bid in video request', function () {
       const bidRequest = bidRequestsVid[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].method).to.equal('POST');
     });
 
     it('should have domain in request', function () {
       const bidRequest = bidRequests[0];
-      const requests = spec.buildRequests([ bidRequest ]);
+      const requests = spec.buildRequests([ bidRequest ], { timeout: 1000 });
       expect(requests[0].data.site.domain).length !== 0;
     });
   });

diff --git a/test/spec/modules/bluebillywigBidAdapter_spec.js b/test/spec/modules/bluebillywigBidAdapter_spec.js
@@ -298,7 +298,7 @@ describe('BlueBillywigAdapter', () => {
       expect(payload.id).to.exist;
       expect(payload.source).to.be.an('object');
       expect(payload.source.tid).to.equal(validBidderRequest.ortb2.source.tid);
-      expect(payload.tmax).to.equal(BB_CONSTANTS.DEFAULT_TIMEOUT);
+      expect(payload.tmax).to.equal(3000);
       expect(payload.imp).to.be.an('array');
       expect(payload.test).to.be.a('number');
       expect(payload).to.have.nested.property('ext.prebid.targeting');

diff --git a/test/spec/modules/lkqdBidAdapter_spec.js b/test/spec/modules/lkqdBidAdapter_spec.js
diff --git a/test/spec/modules/mgidXBidAdapter_spec.js b/test/spec/modules/mgidXBidAdapter_spec.js
@@ -83,7 +83,8 @@ describe('MGIDXBidAdapter', function () {
     },
     refererInfo: {
       referer: 'https://test.com'
-    }
+    },
+    timeout: 1000
   };
 
   describe('isBidRequestValid', function () {

diff --git a/test/spec/modules/oguryBidAdapter_spec.js b/test/spec/modules/oguryBidAdapter_spec.js
@@ -80,6 +80,7 @@ describe('OguryBidAdapter', function () {
     bidderRequestId: 'mock-uuid',
     auctionId: bidRequests[0].auctionId,
     gdprConsent: {consentString: 'myConsentString', vendorData: {}, gdprApplies: true},
+    timeout: 1000
   };
 
   describe('isBidRequestValid', function () {