testing new adapter version

Author: robertrmartinez

modules/rubiconAnalyticsAdapter.js

@@ -13,8 +13,6 @@ const COOKIE_NAME = 'rpaSession';
 const LAST_SEEN_EXPIRE_TIME = 1800000; // 30 mins
 const END_EXPIRE_TIME = 21600000; // 6 hours
 
-const MODULE_INITIALIZED_TIME = utils.getPerformanceNow();
-
 const pbsErrorMap = {
   1: 'timeout-error',
   2: 'input-error',
@@ -154,7 +152,7 @@ function sendMessage(auctionId, bidWonId, trigger) {
       'videoAdFormat', () => bid.videoAdFormat,
       'mediaTypes'
     ]), {
-      adserverTargeting: stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
+      adserverTargeting: !utils.isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
       bidwonStatus: 'success', // hard-coded for now
       accountId,
       siteId: bid.siteId,
@@ -165,8 +163,12 @@ function sendMessage(auctionId, bidWonId, trigger) {
   let auctionCache = cache.auctions[auctionId];
   let referrer = config.getConfig('pageUrl') || (auctionCache && auctionCache.referrer);
   let message = {
+    timestamps: {
+      prebidLoaded: rubiconAdapter.MODULE_INITIALIZED_TIME,
+      auctionEnded: auctionCache.endTs,
+      eventTime: Date.now()
+    },
     trigger,
-    eventTimeMillis: Date.now(),
     integration: rubiConf.int_type || DEFAULT_INTEGRATION,
     version: '$prebid.version$',
     referrerUri: referrer,
@@ -190,8 +192,8 @@ function sendMessage(auctionId, bidWonId, trigger) {
           'transactionId',
           'mediaTypes',
           'dimensions',
-          'adserverTargeting', () => stringProperties(cache.targeting[bid.adUnit.adUnitCode] || {}),
-          'gam',
+          'adserverTargeting', () => !utils.isEmpty(cache.targeting[bid.adUnit.adUnitCode]) ? stringProperties(cache.targeting[bid.adUnit.adUnitCode]) : undefined,
+          'gam', gam => !utils.isEmpty(gam) ? gam : undefined,
           'pbAdSlot',
           'pattern'
         ]);
@@ -305,12 +307,8 @@ function sendMessage(auctionId, bidWonId, trigger) {
       message.bidsWon = bidsWon;
     }
 
-    message.timeAfterLoad = Math.round(utils.getPerformanceNow() - MODULE_INITIALIZED_TIME);
-    message.timeAfterAuctionEnd = Math.round(utils.getPerformanceNow() - auctionCache.endTs);
     auctionCache.sent = true;
   } else if (bidWonId && auctionCache && auctionCache.bids[bidWonId]) {
-    message.timeAfterLoad = Math.round(utils.getPerformanceNow() - MODULE_INITIALIZED_TIME);
-    message.timeAfterAuctionEnd = Math.round(utils.getPerformanceNow() - auctionCache.endTs);
     message.bidsWon = [
       formatBidWon(auctionCache.bids[bidWonId])
     ];
@@ -326,6 +324,10 @@ function sendMessage(auctionId, bidWonId, trigger) {
   );
 }
 
+function adUnitIsOnlyInstream(adUnit) {
+  return adUnit.mediaTypes && Object.keys(adUnit.mediaTypes).length === 1 && utils.deepAccess(adUnit, 'mediaTypes.video.context') === 'instream';
+}
+
 function getBidPrice(bid) {
   // get the cpm from bidResponse
   let cpm;
@@ -516,6 +518,7 @@ function subscribeToGamSlots() {
 
 let baseAdapter = adapter({analyticsType: 'endpoint'});
 let rubiconAdapter = Object.assign({}, baseAdapter, {
+  MODULE_INITIALIZED_TIME: Date.now(),
   referrerHostname: '',
   enableAnalytics(config = {}) {
     let error = false;
@@ -601,7 +604,7 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
           // mark adUnits we expect bidWon events for
           cache.auctions[args.auctionId].bidsWon[bid.adUnitCode] = false;
 
-          if (rubiConf.waitForGamSlots && (!bid.mediaTypes.hasOwnProperty('video') || Object.keys(bid.mediaTypes).length !== 1)) {
+          if (rubiConf.waitForGamSlots && !adUnitIsOnlyInstream(bid)) {
             cache.auctions[args.auctionId].gamHasRendered[bid.adUnitCode] = false;
           }
 
@@ -771,11 +774,18 @@ let rubiconAdapter = Object.assign({}, baseAdapter, {
         break;
       case AUCTION_END:
         // see how long it takes for the payload to come fire
-        cache.auctions[args.auctionId].endTs = utils.getPerformanceNow();
-        // start timer to send batched payload just in case we don't hear any BID_WON events
-        cache.timeouts[args.auctionId] = setTimeout(() => {
-          sendMessage.call(this, args.auctionId, undefined, 'auctionEnd');
-        }, rubiConf.analyticsBatchTimeout || SEND_TIMEOUT);
+        cache.auctions[args.auctionId].endTs = Date.now();
+
+        const isOnlyInstreamAuction = args.adUnits && args.adUnits.every(adUnit => adUnitIsOnlyInstream(adUnit));
+        // If only instream, do not wait around, just send payload
+        if (isOnlyInstreamAuction) {
+          sendMessage.call(this, args.auctionId, undefined, 'instreamAuction');
+        } else {
+          // start timer to send batched payload just in case we don't hear any BID_WON events
+          cache.timeouts[args.auctionId] = setTimeout(() => {
+            sendMessage.call(this, args.auctionId, undefined, 'auctionEnd');
+          }, rubiConf.analyticsBatchTimeout || SEND_TIMEOUT);
+        }
         break;
       case BID_TIMEOUT:
         args.forEach(badBid => {