Skip to content

Commit f21e051

Browse files
sachin-pubmaticShriprasadMPubmatic-Dhruv-SononePubMatic-OpenWrapAdprime
authored
UOE-6646: Adding Adapter Label in Prebid Prometheus for tls_handshake_time stats (#178)
* OTT-105: VCR - Video Event Trackers (#152) VCR - Video Event Trackers changes for PBS Module * OTT-172: Set default min ads to 1 from 2 (#153) * OTT-172: Set default min ads to 1 from 2 * Adding test cases for impression generation algorithm * Revert "OTT-172: Set default min ads to 1 from 2 (#153)" (#154) This reverts commit c360511ffa6e22f754ee02328d857ccbf9f1d804. * UOE-6319: OpenWrap S2S: Prebid Server Version Update to 0.157.0 (#146) * Remove redundad struct (#1432) * Tcf2 id support (#1420) * Default TCF1 GVL in anticipation of IAB no longer hosting the v1 GVL (#1433) * update to the latest go-gdpr release (#1436) * Video endpoint bid selection enhancements (#1419) Co-authored-by: Veronika Solovei <[email protected]> * [WIP] Bid deduplication enhancement (#1430) Co-authored-by: Veronika Solovei <[email protected]> * Refactor rate converter separating scheduler from converter logic to improve testability (#1394) * Fix TCF1 Fetcher Fallback (#1438) * Eplanning adapter: Get domain from page (#1434) * Fix no bid debug log (#1375) * Update the fallback GVL to last version (#1440) * Enable geo activation of GDPR flag (#1427) * Validate External Cache Host (#1422) * first draft * Little tweaks * Scott's review part 1 * Scott's review corrections part 2 * Scotts refactor * correction in config_test.go * Correction and refactor * Multiple return statements * Test case refactor Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * Fixes bug (#1448) * Fixes bug * shortens list * Added adpod_id to request extension (#1444) * Added adpod_id to request -> ext -> appnexus and modified requests splitting based on pod * Unit test fix * Unit test fix * Minor unit test fixes * Code refactoring * Minor code and unit tests refactoring * Unit tests refactoring Co-authored-by: Veronika Solovei <[email protected]> * Adform adapter: additional targeting params added (#1424) * Fix minor error message spelling mistake "vastml" -> "vastxml" (#1455) * Fixing comment for usage of deal priority field (#1451) * moving docs to website repo (#1443) * Fix bid dedup (#1456) Co-authored-by: Veronika Solovei <[email protected]> * consumable: Correct width and height reported in response. (#1459) Prebid Server now responds with the width and height specified in the Bid Response from Consumable. Previously it would reuse the width and height specified in the Bid Request. That older behaviour was ported from an older version of the prebid.js adapter but is no longer valid. * Panics happen when left with zero length []Imp (#1462) * Add Scheme Option To External Cache URL (#1460) * Update gamma adapter (#1447) * Gamma SSP Adapter * Add Gamma SSP server adapter * increase coverage * Fix conflict with base master * Add check MediaType for Imp * Implement Multi Imps request * Changes requested * remove bad-request * increase coverage * Remove duplicate test file * Update gamma.go * Update gamma.go * Update gamma.go * Update config.go Remove Gamma User Sync Url from config * Gamma SSP Adapter * Add Gamma SSP server adapter * increase coverage * Fix conflict with base master * Add check MediaType for Imp * Implement Multi Imps request * Changes requested * remove bad-request * increase coverage * Remove duplicate test file * Update gamma.go * Update gamma.go * update gamma adapter * return nil when have No-Bid Signaling * add missing-adm.json * discard the bid that's missing adm * discard the bid that's missing adm * escape vast instead of encoded it * expand test coverage Co-authored-by: Easy Life <[email protected]> * fix: avoid unexpected EOF on gz writer (#1449) * Smaato adapter: support for video mediaType (#1463) Co-authored-by: vikram <[email protected]> * Rubicon liveramp param (#1466) Add liveramp mapping to user.ext should translate the "liveramp.com" id from the "user.ext.eids" array to "user.ext.liveramp_idl" as follows: ``` { "user": { "ext": { "eids": [{ "source": 'liveramp.com', "uids": [{ "id": "T7JiRRvsRAmh88" }] }] } } } ``` to XAPI: ``` { "user": { "ext": { "liveramp_idl": "T7JiRRvsRAmh88" } } } ``` * Consolidate StoredRequest configs, add validation for all data types (#1453) * Fix Test TestEventChannel_OutputFormat (#1468) * Add ability to randomly generate source.TID if empty and set publisher.ID to resolved account ID (#1439) * Add support for Account configuration (PBID-727, #1395) (#1426) * Minor changes to accounts test coverage (#1475) * Brightroll adapter - adding config support (#1461) * Refactor TCF 1/2 Vendor List Fetcher Tests (#1441) * Add validation checker for PRs and merges with github actions (#1476) * Cache refactor (#1431) Reason: Cache has Fetcher-like functionality to handle both requests and imps at a time. Internally, it still uses two caches configured and searched separately, causing some code repetition. Reusing this code to cache other objects like accounts is not easy. Keeping the req/imp repetition in fetcher and out of cache allows for a reusable simpler cache, preserving existing fetcher functionality. Changes in this set: Cache is now a simple generic id->RawMessage store fetcherWithCache handles the separate req and imp caches ComposedCache handles single caches - but it does not appear to be used Removed cache overlap tests since they do not apply now Slightly less code * Pass Through First Party Context Data (#1479) * Added new size 640x360 (Id: 198) (#1490) * Refactor: move getAccount to accounts package (from openrtb2) (#1483) * Fixed TCF2 Geo Only Enforcement (#1492) * New colossus adapter [Clean branch] (#1495) Co-authored-by: Aiholkin <[email protected]> * New: InMobi Prebid Server Adapter (#1489) * Adding InMobi adapter * code review feedback, also explicitly working with Imp[0], as we don't support multiple impressions * less tolerant bidder params due to sneaky 1.13 -> 1.14+ change * Revert "Added new size 640x360 (Id: 198) (#1490)" (#1501) This reverts commit fa23f5c226df99a9a4ef318100fdb7d84d3e40fa. * CCPA Publisher No Sale Relationships (#1465) * Fix Merge Conflict (#1502) * Update conversant adapter for new prebid-server interface (#1484) * Implement returnCreative (#1493) * Working solution * clean-up * Test copy/paste error Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * ConnectAd S2S Adapter (#1505) * between adapter (#1437) Co-authored-by: Alexey Elymanov <[email protected]> * Invibes adapter (#1469) Co-authored-by: aurel.vasile <[email protected]> * Refactor postgres event producer so it will run either the full or de… (#1485) * Refactor postgres event producer so it will run either the full or delta query periodically * Minor cleanup, follow golang conventions, declare const slice, add test cases * Remove comments * Bidder Uniqueness Gatekeeping Test (#1506) * ucfunnel adapter update end point (#1511) * Refactor EEAC map to be more in line with the nonstandard publisher map (#1514) * Added bunch of new sizes (#1516) * New krushmedia bid adapter (#1504) * Invibes: Generic domainId parameter (#1512) * Smarty ads adapter (#1500) Co-authored-by: Kushneryk Pavlo <[email protected]> Co-authored-by: user <[email protected]> * Add vscode remote container development files (#1481) * First commit (#1510) Co-authored-by: Gus Carreon <[email protected]> * Vtrack and event endpoints (#1467) * Rework pubstack module tests to remove race conditions (#1522) * Rework pubstack module tests to remove race conditions * PR feedback * Remove event count and add helper methods to assert events received on channel * Updating smartadserver endpoint configuration. (#1531) Co-authored-by: tadam <[email protected]> * Add new size 500x1000 (ID: 548) (#1536) * Fix missing Request parameter for Adgeneration Adapter (#1525) * Fix endpoint url for TheMediaGrid Bid Adapter (#1541) * Add Account cache (#1519) * Add bidder name key support (#1496) * Simplifying exchange module: bidResponseExt gets built anyway (#1518) * first draft * Scott's feedback * stepping out real quick * add cache errors to bidResponseExt before marshalling * Removed vim's swp file Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * Correct GetCpmStringValue's second return value (#1520) * Add metrics to capture stored data fetch all/delta durations with fetch status (#1515) * Adds preferDeals support (#1528) * Emxd 3336 add app video ctv (#1529) * Adapter changes for app and video support * adding ctv devicetype test case * Adding whitespace * Updates based on feedback from Prebid team * protocol bug fix and testing * Modifying test cases to accomodate new imp.ext field * bidtype bug fix and additonal testcase for storeUrl Co-authored-by: Rakesh Balakrishnan <[email protected]> Co-authored-by: Dan Bogdan <[email protected]> * Add http api for fetching accounts (#1545) * Add missing postgres cache init config validation * Acuity ads adapter (#1537) Co-authored-by: Kushneryk Pavlo <[email protected]> * Yieldmo app support in yaml file (#1542) Co-authored-by: Winston <[email protected]> * Add metrics for account cache (#1543) * [Invibes] remove user sync for invibes (#1550) * [invibes] new bidder stub * [invibes] make request * [invibes] bid request parameters * [invibes] fix errors, add tests * [invibes] new version of MakeBids * cleaning code * [invibes] production urls, isamp flag * [invibes] fix parameters * [invibes] new test parameter * [invibes] change maintainer email * [invibes] PR fixes * [invibes] fix parameters test * [invibes] refactor endpoint template and bidVersion * [Invibes] fix tests * [invibes] resolve PR * [invibes] fix test * [invibes] fix test * [invibes] generic domainId parameter * [invibes] remove invibes cookie sync * [Invibes] comment missing Usersync Co-authored-by: aurel.vasile <[email protected]> * Add Support For imp.ext.prebid For DealTiers (#1539) * Add Support For imp.ext.prebid For DealTiers * Remove Normalization * Add Accounts to http cache events (#1553) * Fix JSON tests ignore expected message field (#1450) * NoBid version 1.0. Initial commit. (#1547) Co-authored-by: Reda Guermas <[email protected]> * Added dealTierSatisfied parameters in exchange.pbsOrtbBid and openrtb_ext.ExtBidPrebid and dealPriority in openrtb_ext.ExtBidPrebid (#1558) Co-authored-by: Shriprasad <[email protected]> * Add client/AccountID support into Adoppler adapter. (#1535) * Optionally read IFA value and add it the the request url (Adhese) (#1563) * Add AMX RTB adapter (#1549) * update Datablocks usersync.go (#1572) * 33Across: Add video support in adapter (#1557) * SilverMob adapter (#1561) * SilverMob adapter * Fixes andchanges according to notes in PR * Remaining fixes: multibids, expectedMakeRequestsErrors * removed log * removed log * Multi-bid test * Removed unnesesary block Co-authored-by: Anton Nikityuk <[email protected]> * Updated ePlanning GVL ID (#1574) * update adpone google vendor id (#1577) * ADtelligent gvlid (#1581) * Add account/ host GDPR enabled flags & account per request type GDPR enabled flags (#1564) * Add account level request type specific and general GDPR enabled flags * Clean up test TestAccountLevelGDPREnabled * Add host-level GDPR enabled flag * Move account GDPR enable check as receiver method on accountGDPR * Remove mapstructure annotations on account structs * Minor test updates * Re-add mapstructure annotations on account structs * Change RequestType to IntegrationType and struct annotation formatting * Update comment * Update account IntegrationType comments * Remove extra space in config/accounts.go via gofmt * DMX Bidfloor fix (#1579) * adform bidder video bid response support (#1573) * Fix Beachfront JSON tests (#1578) * Add account CCPA enabled and per-request-type enabled flags (#1566) * Add account level request-type-specific and general CCPA enabled flags * Remove mapstructure annotations on CCPA account structs and clean up CCPA tests * Adjust account/host CCPA enabled flag logic to incorporate feedback on similar GDPR feature * Add shared privacy policy account integration data structure * Refactor EnabledForIntegrationType methods on account privacy objects * Minor test refactor * Simplify logic in EnabledForIntegrationType methods * Refactored HoldAuction Arguments (#1570) * Fix bug in request.imp.ext Validation (#1575) * First draft * Brian's reivew * Removed leftover comments Co-authored-by: Gus Carreon <[email protected]> * Bugfix: default admin port is 6060 (#1595) * Add timestamp to analytics and response.ext.prebid.auctiontimestamp l… (#1584) * Added app capabilities to VerizonMedia adapter (#1596) Co-authored-by: oath-jac <[email protected]> * New Adapter Initialization Framework (#1532) * Fix 33Across App Handling (#1602) * Fix adapter JSON tests to have the right test structure (#1589) * Fix JSON EMX Digital * Fix JSON Brightroll * Fix JSON Beintoo * Fix JSON Gamoshi * Fix JSON Kubient * Fix JSON Marsmedia * Fix JSON Nanointeractive * Fix JSON Telaria * Fix JSON valueimpression * Fix JSON smartyads * Fix JSON rhythmone * Fix JSON krushmedia * Fix JSON cpmstar * Fix JSON acuityads * Fix JSON avocet * Rename wrongly named acuity ads test file * Fix JSON gamma * Add expected no bid responses * Fixed indentation and asesome-markup * Added usersync support to Between SSP adapter; Major fixes and refactor (#1587) Co-authored-by: Egor Skorokhodov <[email protected]> * Removed Safari Metric (#1571) * Deepintent adapter (#1524) Co-authored-by: Sourabh Gandhe <[email protected]> * update mobilefuse endpoint (#1606) Co-authored-by: Dan Barnett <[email protected]> * Fix Missing Consumable Clock (#1610) * Remove Hook Scripts (#1614) * Add config gdpr.amp_exception deprecation warning (#1612) * Refactor Adapter Config To Its Own File (#1608) * RP adapter: use video placement parameter to set size ID (#1607) * Add a BidderRequest struct to hold bidder specific request info (#1611) * Add warning that gdpr checks will be skipped when gdpr.host_vendor_id… (#1615) * Add TLS Handshake connection metrics (#1613) * Improve GitHub Actions Validation (#1590) * Move SSL to Server directory (#1625) * Rename currencies to currency (#1626) * Deepintent: Params normalization (#1617) Co-authored-by: Sourabh Gandhe <[email protected]> * Set Kubient email to [email protected] (#1629) * Rename pbsmetrics to metrics (#1624) * 33Across: Add support for multi-imp requests (#1609) * changed usersync endpoint (#1631) Co-authored-by: Sourabh Gandhe <[email protected]> * Remove legacy GDPR AMP config flag used to prevent buyer ID scrub on AMP requests (#1565) * Updating contact info for adprime (#1640) * ucfunnel adapter update end point (#1639) * New Adapter: Mobfox (#1585) Co-authored-by: mobfox <[email protected]> * IX: Implement Bidder interface, update endpoint. (#1569) Co-authored-by: Index Exchange Prebid Team <[email protected]> * Fix GDPR consent assumption when gdpr req signal is unambiguous and s… (#1591) * Fix GDPR consent assumption when gdpr req signal is unambiguous and set to 1 and consent string is blank * Refactor TestAllowPersonalInfo to make it table-based and add empty consent string cases * Update PersonalInfoAllowed to allow PI if the request indicates GDPR does not apply * Update test descriptions * Update default vendor permissions to only allow PI based on UserSyncIfAmbiguous if request GDPR signal is ambiguous * Change GDPR request signal type name and other PR feedback code style changes * Rename GDPR package signal constants and consolidate gdprEnforced and gdprEnabled variables * Hoist GDPR signal/empty consent checks before vendor list check * Rename gdpr to gdprSignal in Permissions interface and implementations * Fix merge mistakes * Update gdpr logic to set the gdpr signal when ambiguous according to the config flag * Add userSyncIfAmbiguous to all test cases in TestAllowPersonalInfo * Simplify TestAllowPersonalInfo * Fix appnexus adapter not setting currency in the bid response (#1642) Co-authored-by: Gus <[email protected]> * Add Adot adapter (#1605) Co-authored-by: Aurélien Giudici <[email protected]> * Refactor AMP Param Parsing (#1627) * Refactor AMP Param Parsing * Added Tests * Enforce GDPR privacy if there's an error parsing consent (#1593) * Enforce GDPR privacy if there's an error parsing consent * Update test with consent string variables to improve readability * Fix test typo * Update test variable names to follow go conventions * MediaFuse adapter (#1635) * MediaFuse alias * Syncer and tests * gvlid * gvlid * new mail * New Adapter: Revcontent (#1622) * Fix Unruly Bidder Parmaters (#1616) * Implement EID Permissions (#1633) * Implement EID Permissions * Idsync removal (#1644) Co-authored-by: steve-a-districtm <[email protected]> Co-authored-by: Steve Alliance <[email protected]> * Audit beachfront tests and change some videoResponseType details (#1638) * Adding Events support in bid responses (#1597) * Fix Shared Memory Corruption In EMX_Digital (#1646) * Add gdpr.tcf1.fetch_gvl deprecation warning and update GVL subdomain (#1660) * Bubble up GDPR signal/consent errors while applying privacy policies (#1651) * Always sync when GDPR globally enabled and allow host cookie sync … (#1656) * Eplanning: new prioritization metric for adunit sizes (#1648) * Eplanning: new prioritization metric for adunit sizes * removing IX's usersync default URL (#1670) Co-authored-by: Index Exchange Prebid Team <[email protected]> * AMX Bid Adapter: Loop Variable Bug (#1675) * requestheaders: new parameter inside debug.httpcalls.<BIDDER> to log request header details (#1659) * Added support for logging requestheaders inside httpCalls.requestheaders * Reverterd test case change * Modified outgoing mock request for appnexus, to send some request header information. Modified sample mock response such that ext.debug.httpcalls.appnexus.requestheaders will return the information of passed request headers * Addressed code review comments given by SyntaxNode. Also Moved RequestHeaders next to RequestBidy in openrtb_ext.ExtHttpCall Co-authored-by: Shriprasad <[email protected]> * Updating pulsepoint adapter (#1663) * Debug disable feature implementation: (#1677) Co-authored-by: Veronika Solovei <[email protected]> * Always use fallback GVL for TCF1 (#1657) * Update TCF2 GVL subdomain and always use fallback GVL for TCF1 * Add config test coverage for invalid TCF1 FetchGVL and AMP Exception * Delete obselete test * Adform adapter: digitrust cleanup (#1690) * adform secure endpoint as default setting * digitrust cleanup * New Adapter: DecenterAds (#1669) Co-authored-by: vlad <[email protected]> * Handle empty consent string during cookie sync and setuid (#1671) * Handle empty consent string during cookie sync and setuid * Remove todo comment * Make auction test table driven and convert GDPR impl normalize method to pass by value * Moved legacy auction endpoint signal parsing into its own method and removed unnecessary test cases * Fix SignalParse method to return nil for error when raw signal is empty and other PR feedback * Tappx User Syncer + Site Update (#1674) Co-authored-by: ubuntu <[email protected]> Co-authored-by: Albert Grandes <[email protected]> * Beachfront Additional tests (#1679) * added place holder files for all but a couple of the intended new tests. I need to grok what those couple mean before being able to name a file. * This covers most of the suggested cases and a couple more that occured to me. I'll look at the couple that I held off on next. * added the unmarshal tests and found a couple problems to address in the process. * removed my __debug_bin. should be in gitignore. * A bit of clean up and commenting. Bumped version number. Added __debug_bin to .gitignore. This is the debugging binary created by Visual Studio Code, or at least version 1.52.1. * missed a bunch of version strings * removed IP faker * If IP is not included in an AdM request, an error is now thrown for the AdM imp instead of faking it. The AdM endpoint is the only one that requires an IP. Also, added several "no-ip" test cases. * Whent back to the fake IP solution instead of the error. Removed most of the "no-ip" test cases, leaving one. * changed ip in adm-video.json to not match the faker ip * removed a debugging comment * New Adapter: Onetag (#1695) * Pubmatic: Trimming publisher ID before passing (#1685) * Trimming publisher ID before passing * Fix typos in nobid.json (#1704) * Fix Typo In Adform Bidder Params (#1705) * Don't Load GVL v1 for TCF2 (+ TCF1 Cleanup) (#1693) * Typo fix for connectad bidder params (#1706) * Typo fix for invibes bidder params (#1707) * Typo fix nanointeractive bidder params (#1708) * Isolate /info/bidders Data Model + Add Uses HTTPS Flag (#1692) * Initial Commit * Merge Conflict Fixes * Removed Unncessary JSON Attributes * Removed Dev Notes * Add Missing validateDefaultAliases Test * Improved Reversed Test * Remove Var Scope Confusion * Proper Tests For Bidder Param Validator * Removed Unused Test Setup * New Adapter: Epom (#1680) Co-authored-by: Vasyl Zarva <[email protected]> * New Adapter: Pangle (#1697) Co-authored-by: hcai <[email protected]> * Fix Merge Conflict (#1714) * GumGum: adds pubId and irisid properties/parameters (#1664) * adds pubId and irisid properties * updates per naming convention & makes a video copy * updates when to copy banner, adds Publisher fallback and multiformat request * adds more json tests * rename the json file to remove whitespaces * Accommodate Apple iOS LMT bug (#1718) * New Adapter: jixie (#1698) * initial commit * added notes file for temp use * jixie adapter development work * jixie adaptor development work: mainly the test json files but also the jixie usersync code * added a test case with accountid. and cosmetic line changes in the banner*json test file * updated the jixie user sync: the endpoint and some params stuf * tks and fixing per comments on pull request 1698 * responding to guscarreon's comments: -more checking in makerequest of the bidder params (added 2 more test jsons) -removed blank lines, lines commented out -test_params: a case with unit alone -BadInput error * responding to review. put condition on jixie unit string in the bidder-params/jixie.json file. removed checking in jixie.go that has become unnecssary. removed unnec test cases. updated params-test * added one failed params test * removed a function that I no longer call! * renamed JixieAdapter to adapter * removed bidfloor from jixie explicit ext params * Fix Regs Nil Condition (#1723) * Mobfox: Add rout to adexcange (#1702) Co-authored-by: mobfox <[email protected]> * New Adapter: TrustX (#1726) * New Adapter: UNICORN (#1719) * add bidder-info, bidder-params for UNICORN * Add adapter * Fixes GDPR bug about being overly strict on publisher restrictions (#1730) * 33Across: Updated exchange endpoint (#1738) * New Adapter: Adyoulike (#1700) Co-authored-by: Damien Dumas <[email protected]> * Hoist GVL ID To Bidder Info (#1721) * Improve Digital adapter: add support for native ads (#1746) * Add Support For SkAdN + Refactor Split Imps (#1741) * No Longer Move bid.ext To bid.ext.bidder (#1742) * No Longer Move bid.ext To bid.ext.bidder * Remove Similar Behavior From seatbid.ext * Avoid Second Bid Copy * Removed Unused seatbid.ext * Typo fix: adyoulike bidder param debug description (#1755) * Aliases: Better Error Message For Disabled Bidder (#1751) * beachfront: Changes to support real 204 (#1737) * Fix race condition in 33across.go (#1757) Co-authored-by: Gus Carreon <[email protected]> * Revert "Fix race condition in 33across.go (#1757)" (#1763) This reverts commit bdf1e7b3e13bdf87d3282bf74472fc66504537d5. * Replace TravisCI With GitHub Actions (#1754) * Initial Commit * Finished Configuration * Remove TravisCI * Remove TravisCI * Fix Go Version Badge * Correct Fix For Go Version Badge * Removed Custom Config File Name * Debug warnings (#1724) Co-authored-by: Veronika Solovei <[email protected]> * Rubicon: Support sending segments to XAPI (#1752) Co-authored-by: Serhii Nahornyi <[email protected]> * validateNativeContextTypes function test cases (#1743) * Applogy: Fix Shared Memory Overwriting (#1758) * Pubmatic: Fix Shared Memory Overwriting (#1759) * Beachfront: Fix Shared Memory Overwriting (#1762) * Fix race condition in Beachfront adapter * Removed nil check and simplified * FPD: Allow imp.ext.data To Passthrough To Adapters (#1765) * Smaato: Add support for app (#1767) Co-authored-by: Bernhard Pickenbrock <[email protected]> * Update sync types (#1770) * 33across: Fix Shared Memory Overwriting (#1764) This reverts commit f7df258f061788ef7e72529115aa5fd554fa9f16. * Fix race condition in Yeahmobi adapter (#1761) Co-authored-by: Gus Carreon <[email protected]> * Pubnative: Fix Shared Memory Overwriting (#1760) * Add request for registration (#1780) * Update OpenRTB Library (#1733) * Tappx changes - Backward compatible change of version (#1777) Co-authored-by: ubuntu <[email protected]> Co-authored-by: Albert Grandes <[email protected]> * DMX: Enforcing w and h in imp (#1778) Co-authored-by: steve-a-districtm <[email protected]> * Remove Authorization Headers From Debug Response (#1779) * Hide Authorization Headers In Debug Response * MakeExtHeaders Tests * Add Empty Test * Use http.Header Methods * Updates From Code Review * Fix Merge Conflict * New Adapter: Bidmachine (#1769) * New Adapter: Criteo (#1775) * Fix shared memory issue when stripping authorization header from bid requests (#1790) * RTB House: update parameters (#1785) * update parameters required by RTB House adapter * tabs to spaces Co-authored-by: Przemyslaw Iwanczak <[email protected]> * Generate seatbid[].bid[].ext.prebid.bidid (#1772) * Basic GDPR enforcement for specific publisher-vendors. (#1782) * New Adapter: Zemanta (#1774) * add zemanta adapter * update openrtb package for zemanta * fix loop iterator reference bug * fix getMediaTypeForImp to match server behavior * Zemanta: Rename Adapter To Outbrain (#1797) * Update openrtb library to v15 (#1802) * IX: Set bidVideo when category and duration is available (#1794) * Update IX defaults (#1799) Co-authored-by: Mike Burns <[email protected]> * Update Adyoulike endpoint to hit production servers (#1805) * Openx: use bidfloor if set - prebid.js adapter behavior (#1795) * [ORBIDDER] add gvlVendorID and set bid response currency (#1798) * New Adapter: ADXCG (#1803) * Update kidoz properties to type string (#1808) Remove definitions object from schema and define types and other parameters directly in properties objects to ensure compatibility with more downstream systems that use this schema. * Update bidmachine properties to type string (#1809) Remove definitions object from schema and define types and other parameters directly in properties objects to ensure compatibility with more downstream systems that use this schema. * transform native eventtrackers to imptrackers and jstracker (#1811) * TheMediaGrid: Added processing of imp[].ext.data (#1807) * Renaming package github.com/PubMatic-OpenWrap/openrtb to github.com/mxmCherry/openrtb * Rename package github.com/PubMatic-OpenWrap/prebid-server to github.com/prebid/prebid-server * UOE-6196: OpenWrap S2S: Remove adpod_id from AppNexus adapter * Refactored code and fixed indentation * Fixed indentation for json files * Fixed indentation for json files * Fixed import in adapters/gumgum/gumgum.go * Reverted unwanted changes in test json files * Fixed unwanted git merge changes * Added missing field SkipDedup in ExtIncludeBrandCategory * Added missing Bidder field in ExtBid type * Exposing CookieSyncRequest for header-bidding * Temporary path change for static folder * Fixed static folder paths * Fixed default value in config for usersync_if_ambiguous * Fixed config after upgrade * Updated router.go to uncomment defaultRequest validation * Fixed path for accounts.filesystem.directorypath * Fixed diff with OW * Added DMX default usersync URL * Adding changes missed for UOE-5114 during prebid-server upgrade Co-authored-by: Adprime <[email protected]> Co-authored-by: hhhjort <[email protected]> Co-authored-by: Veronika Solovei <[email protected]> Co-authored-by: Veronika Solovei <[email protected]> Co-authored-by: Brian Sardo <[email protected]> Co-authored-by: Scott Kay <[email protected]> Co-authored-by: chino117 <[email protected]> Co-authored-by: Cameron Rice <[email protected]> Co-authored-by: guscarreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Jurij Sinickij <[email protected]> Co-authored-by: Rob Hazan <[email protected]> Co-authored-by: bretg <[email protected]> Co-authored-by: Daniel Cassidy <[email protected]> Co-authored-by: GammaSSP <[email protected]> Co-authored-by: Easy Life <[email protected]> Co-authored-by: gpolaert <[email protected]> Co-authored-by: Stephan Brosinski <[email protected]> Co-authored-by: vikram <[email protected]> Co-authored-by: Dmitriy <[email protected]> Co-authored-by: Laurentiu Badea <[email protected]> Co-authored-by: Mansi Nahar <[email protected]> Co-authored-by: smithaammassamveettil <[email protected]> Co-authored-by: hdeodhar <[email protected]> Co-authored-by: Bill Newman <[email protected]> Co-authored-by: Aiholkin <[email protected]> Co-authored-by: Daniel Lawrence <[email protected]> Co-authored-by: johnwier <[email protected]> Co-authored-by: rtuschkany <[email protected]> Co-authored-by: Alexey Elymanov <[email protected]> Co-authored-by: Alexey Elymanov <[email protected]> Co-authored-by: invibes <[email protected]> Co-authored-by: aurel.vasile <[email protected]> Co-authored-by: ucfunnel <[email protected]> Co-authored-by: Krushmedia <[email protected]> Co-authored-by: Kushneryk Pavel <[email protected]> Co-authored-by: Kushneryk Pavlo <[email protected]> Co-authored-by: user <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Daniel Barrigas <[email protected]> Co-authored-by: tadam75 <[email protected]> Co-authored-by: tadam <[email protected]> Co-authored-by: Andrea Cannuni <[email protected]> Co-authored-by: Ad Generation <[email protected]> Co-authored-by: TheMediaGrid <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Dan Bogdan <[email protected]> Co-authored-by: Rakesh Balakrishnan <[email protected]> Co-authored-by: Dan Bogdan <[email protected]> Co-authored-by: AcuityAdsIntegrations <[email protected]> Co-authored-by: Winston-Yieldmo <[email protected]> Co-authored-by: Winston <[email protected]> Co-authored-by: redaguermas <[email protected]> Co-authored-by: Reda Guermas <[email protected]> Co-authored-by: ShriprasadM <[email protected]> Co-authored-by: Shriprasad <[email protected]> Co-authored-by: Viacheslav Chimishuk <[email protected]> Co-authored-by: Sander <[email protected]> Co-authored-by: Nick Jacob <[email protected]> Co-authored-by: htang555 <[email protected]> Co-authored-by: Aparna Rao <[email protected]> Co-authored-by: silvermob <[email protected]> Co-authored-by: Anton Nikityuk <[email protected]> Co-authored-by: Seba Perez <[email protected]> Co-authored-by: Sergio <[email protected]> Co-authored-by: Gena <[email protected]> Co-authored-by: Steve Alliance <[email protected]> Co-authored-by: Peter Fröhlich <[email protected]> Co-authored-by: oath-jac <[email protected]> Co-authored-by: oath-jac <[email protected]> Co-authored-by: egsk <[email protected]> Co-authored-by: Egor Skorokhodov <[email protected]> Co-authored-by: Sourabh Gandhe <[email protected]> Co-authored-by: Sourabh Gandhe <[email protected]> Co-authored-by: dtbarne <[email protected]> Co-authored-by: Dan Barnett <[email protected]> Co-authored-by: Serhii Nahornyi <[email protected]> Co-authored-by: Marsel <[email protected]> Co-authored-by: mobfxoHB <[email protected]> Co-authored-by: Index Exchange 3 Prebid Team <[email protected]> Co-authored-by: Index Exchange Prebid Team <[email protected]> Co-authored-by: Giudici-a <[email protected]> Co-authored-by: Aurélien Giudici <[email protected]> Co-authored-by: jcamp-revc <[email protected]> Co-authored-by: steve-a-districtm <[email protected]> Co-authored-by: Steve Alliance <[email protected]> Co-authored-by: Jim Naumann <[email protected]> Co-authored-by: Anand Venkatraman <[email protected]> Co-authored-by: Vladyslav Laktionov <[email protected]> Co-authored-by: vlad <[email protected]> Co-authored-by: prebidtappx <[email protected]> Co-authored-by: ubuntu <[email protected]> Co-authored-by: Albert Grandes <[email protected]> Co-authored-by: onetag-dev <[email protected]> Co-authored-by: agilfix <[email protected]> Co-authored-by: epomrnd <[email protected]> Co-authored-by: Vasyl Zarva <[email protected]> Co-authored-by: Hengsheng Cai <[email protected]> Co-authored-by: hcai <[email protected]> Co-authored-by: susyt <[email protected]> Co-authored-by: jxdeveloper1 <[email protected]> Co-authored-by: faithnh <[email protected]> Co-authored-by: guiann <[email protected]> Co-authored-by: Damien Dumas <[email protected]> Co-authored-by: Jozef Bartek <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Serhii Nahornyi <[email protected]> Co-authored-by: el-chuck <[email protected]> Co-authored-by: Bernhard Pickenbrock <[email protected]> Co-authored-by: Pavel Dunyashev <[email protected]> Co-authored-by: Benjamin <[email protected]> Co-authored-by: Przemysław Iwańczak <[email protected]> Co-authored-by: Przemyslaw Iwanczak <[email protected]> Co-authored-by: Rok Sušnik <[email protected]> Co-authored-by: Rok Sušnik <[email protected]> Co-authored-by: ixjohnny <[email protected]> Co-authored-by: Michael Burns <[email protected]> Co-authored-by: Mike Burns <[email protected]> Co-authored-by: Arne Schulz <[email protected]> Co-authored-by: adxcgcom <[email protected]> * UOE-6319: Upgraded prebid-server to 0.157.0 (#156) * Default TCF1 GVL in anticipation of IAB no longer hosting the v1 GVL (#1433) * update to the latest go-gdpr release (#1436) * Video endpoint bid selection enhancements (#1419) Co-authored-by: Veronika Solovei <[email protected]> * [WIP] Bid deduplication enhancement (#1430) Co-authored-by: Veronika Solovei <[email protected]> * Refactor rate converter separating scheduler from converter logic to improve testability (#1394) * Fix TCF1 Fetcher Fallback (#1438) * Eplanning adapter: Get domain from page (#1434) * Fix no bid debug log (#1375) * Update the fallback GVL to last version (#1440) * Enable geo activation of GDPR flag (#1427) * Validate External Cache Host (#1422) * first draft * Little tweaks * Scott's review part 1 * Scott's review corrections part 2 * Scotts refactor * correction in config_test.go * Correction and refactor * Multiple return statements * Test case refactor Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * Fixes bug (#1448) * Fixes bug * shortens list * Added adpod_id to request extension (#1444) * Added adpod_id to request -> ext -> appnexus and modified requests splitting based on pod * Unit test fix * Unit test fix * Minor unit test fixes * Code refactoring * Minor code and unit tests refactoring * Unit tests refactoring Co-authored-by: Veronika Solovei <[email protected]> * Adform adapter: additional targeting params added (#1424) * Fix minor error message spelling mistake "vastml" -> "vastxml" (#1455) * Fixing comment for usage of deal priority field (#1451) * moving docs to website repo (#1443) * Fix bid dedup (#1456) Co-authored-by: Veronika Solovei <[email protected]> * consumable: Correct width and height reported in response. (#1459) Prebid Server now responds with the width and height specified in the Bid Response from Consumable. Previously it would reuse the width and height specified in the Bid Request. That older behaviour was ported from an older version of the prebid.js adapter but is no longer valid. * Panics happen when left with zero length []Imp (#1462) * Add Scheme Option To External Cache URL (#1460) * Update gamma adapter (#1447) * Gamma SSP Adapter * Add Gamma SSP server adapter * increase coverage * Fix conflict with base master * Add check MediaType for Imp * Implement Multi Imps request * Changes requested * remove bad-request * increase coverage * Remove duplicate test file * Update gamma.go * Update gamma.go * Update gamma.go * Update config.go Remove Gamma User Sync Url from config * Gamma SSP Adapter * Add Gamma SSP server adapter * increase coverage * Fix conflict with base master * Add check MediaType for Imp * Implement Multi Imps request * Changes requested * remove bad-request * increase coverage * Remove duplicate test file * Update gamma.go * Update gamma.go * update gamma adapter * return nil when have No-Bid Signaling * add missing-adm.json * discard the bid that's missing adm * discard the bid that's missing adm * escape vast instead of encoded it * expand test coverage Co-authored-by: Easy Life <[email protected]> * fix: avoid unexpected EOF on gz writer (#1449) * Smaato adapter: support for video mediaType (#1463) Co-authored-by: vikram <[email protected]> * Rubicon liveramp param (#1466) Add liveramp mapping to user.ext should translate the "liveramp.com" id from the "user.ext.eids" array to "user.ext.liveramp_idl" as follows: ``` { "user": { "ext": { "eids": [{ "source": 'liveramp.com', "uids": [{ "id": "T7JiRRvsRAmh88" }] }] } } } ``` to XAPI: ``` { "user": { "ext": { "liveramp_idl": "T7JiRRvsRAmh88" } } } ``` * Consolidate StoredRequest configs, add validation for all data types (#1453) * Fix Test TestEventChannel_OutputFormat (#1468) * Add ability to randomly generate source.TID if empty and set publisher.ID to resolved account ID (#1439) * Add support for Account configuration (PBID-727, #1395) (#1426) * Minor changes to accounts test coverage (#1475) * Brightroll adapter - adding config support (#1461) * Refactor TCF 1/2 Vendor List Fetcher Tests (#1441) * Add validation checker for PRs and merges with github actions (#1476) * Cache refactor (#1431) Reason: Cache has Fetcher-like functionality to handle both requests and imps at a time. Internally, it still uses two caches configured and searched separately, causing some code repetition. Reusing this code to cache other objects like accounts is not easy. Keeping the req/imp repetition in fetcher and out of cache allows for a reusable simpler cache, preserving existing fetcher functionality. Changes in this set: Cache is now a simple generic id->RawMessage store fetcherWithCache handles the separate req and imp caches ComposedCache handles single caches - but it does not appear to be used Removed cache overlap tests since they do not apply now Slightly less code * Pass Through First Party Context Data (#1479) * Added new size 640x360 (Id: 198) (#1490) * Refactor: move getAccount to accounts package (from openrtb2) (#1483) * Fixed TCF2 Geo Only Enforcement (#1492) * New colossus adapter [Clean branch] (#1495) Co-authored-by: Aiholkin <[email protected]> * New: InMobi Prebid Server Adapter (#1489) * Adding InMobi adapter * code review feedback, also explicitly working with Imp[0], as we don't support multiple impressions * less tolerant bidder params due to sneaky 1.13 -> 1.14+ change * Revert "Added new size 640x360 (Id: 198) (#1490)" (#1501) This reverts commit fa23f5c226df99a9a4ef318100fdb7d84d3e40fa. * CCPA Publisher No Sale Relationships (#1465) * Fix Merge Conflict (#1502) * Update conversant adapter for new prebid-server interface (#1484) * Implement returnCreative (#1493) * Working solution * clean-up * Test copy/paste error Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * ConnectAd S2S Adapter (#1505) * between adapter (#1437) Co-authored-by: Alexey Elymanov <[email protected]> * Invibes adapter (#1469) Co-authored-by: aurel.vasile <[email protected]> * Refactor postgres event producer so it will run either the full or de… (#1485) * Refactor postgres event producer so it will run either the full or delta query periodically * Minor cleanup, follow golang conventions, declare const slice, add test cases * Remove comments * Bidder Uniqueness Gatekeeping Test (#1506) * ucfunnel adapter update end point (#1511) * Refactor EEAC map to be more in line with the nonstandard publisher map (#1514) * Added bunch of new sizes (#1516) * New krushmedia bid adapter (#1504) * Invibes: Generic domainId parameter (#1512) * Smarty ads adapter (#1500) Co-authored-by: Kushneryk Pavlo <[email protected]> Co-authored-by: user <[email protected]> * Add vscode remote container development files (#1481) * First commit (#1510) Co-authored-by: Gus Carreon <[email protected]> * Vtrack and event endpoints (#1467) * Rework pubstack module tests to remove race conditions (#1522) * Rework pubstack module tests to remove race conditions * PR feedback * Remove event count and add helper methods to assert events received on channel * Updating smartadserver endpoint configuration. (#1531) Co-authored-by: tadam <[email protected]> * Add new size 500x1000 (ID: 548) (#1536) * Fix missing Request parameter for Adgeneration Adapter (#1525) * Fix endpoint url for TheMediaGrid Bid Adapter (#1541) * Add Account cache (#1519) * Add bidder name key support (#1496) * Simplifying exchange module: bidResponseExt gets built anyway (#1518) * first draft * Scott's feedback * stepping out real quick * add cache errors to bidResponseExt before marshalling * Removed vim's swp file Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> Co-authored-by: Gus Carreon <[email protected]> * Correct GetCpmStringValue's second return value (#1520) * Add metrics to capture stored data fetch all/delta durations with fetch status (#1515) * Adds preferDeals support (#1528) * Emxd 3336 add app video ctv (#1529) * Adapter changes for app and video support * adding ctv devicetype test case * Adding whitespace * Updates based on feedback from Prebid team * protocol bug fix and testing * Modifying test cases to accomodate new imp.ext field * bidtype bug fix and additonal testcase for storeUrl Co-authored-by: Rakesh Balakrishnan <[email protected]> Co-authored-by: Dan Bogdan <[email protected]> * Add http api for fetching accounts (#1545) * Add missing postgres cache init config validation * Acuity ads adapter (#1537) Co-authored-by: Kushneryk Pavlo <[email protected]> * Yieldmo app support in yaml file (#1542) Co-authored-by: Winston <[email protected]> * Add metrics for account cache (#1543) * [Invibes] remove user sync for invibes (#1550) * [invibes] new bidder stub * [invibes] make request * [invibes] bid request parameters * [invibes] fix errors, add tests * [invibes] new version of MakeBids * cleaning code * [invibes] production urls, isamp flag * [invibes] fix parameters * [invibes] new test parameter * [invibes] change maintainer email * [invibes] PR fixes * [invibes] fix parameters test * [invibes] refactor endpoint template and bidVersion * [Invibes] fix tests * [invibes] resolve PR * [invibes] fix test * [invibes] fix test * [invibes] generic domainId parameter * [invibes] remove invibes cookie sync * [Invibes] comment missing Usersync Co-authored-by: aurel.vasile <[email protected]> * Add Support For imp.ext.prebid For DealTiers (#1539) * Add Support For imp.ext.prebid For DealTiers * Remove Normalization * Add Accounts to http cache events (#1553) * Fix JSON tests ignore expected message field (#1450) * NoBid version 1.0. Initial commit. (#1547) Co-authored-by: Reda Guermas <[email protected]> * Added dealTierSatisfied parameters in exchange.pbsOrtbBid and openrtb_ext.ExtBidPrebid and dealPriority in openrtb_ext.ExtBidPrebid (#1558) Co-authored-by: Shriprasad <[email protected]> * Add client/AccountID support into Adoppler adapter. (#1535) * Optionally read IFA value and add it the the request url (Adhese) (#1563) * Add AMX RTB adapter (#1549) * update Datablocks usersync.go (#1572) * 33Across: Add video support in adapter (#1557) * SilverMob adapter (#1561) * SilverMob adapter * Fixes andchanges according to notes in PR * Remaining fixes: multibids, expectedMakeRequestsErrors * removed log * removed log * Multi-bid test * Removed unnesesary block Co-authored-by: Anton Nikityuk <[email protected]> * Updated ePlanning GVL ID (#1574) * update adpone google vendor id (#1577) * ADtelligent gvlid (#1581) * Add account/ host GDPR enabled flags & account per request type GDPR enabled flags (#1564) * Add account level request type specific and general GDPR enabled flags * Clean up test TestAccountLevelGDPREnabled * Add host-level GDPR enabled flag * Move account GDPR enable check as receiver method on accountGDPR * Remove mapstructure annotations on account structs * Minor test updates * Re-add mapstructure annotations on account structs * Change RequestType to IntegrationType and struct annotation formatting * Update comment * Update account IntegrationType comments * Remove extra space in config/accounts.go via gofmt * DMX Bidfloor fix (#1579) * adform bidder video bid response support (#1573) * Fix Beachfront JSON tests (#1578) * Add account CCPA enabled and per-request-type enabled flags (#1566) * Add account level request-type-specific and general CCPA enabled flags * Remove mapstructure annotations on CCPA account structs and clean up CCPA tests * Adjust account/host CCPA enabled flag logic to incorporate feedback on similar GDPR feature * Add shared privacy policy account integration data structure * Refactor EnabledForIntegrationType methods on account privacy objects * Minor test refactor * Simplify logic in EnabledForIntegrationType methods * Refactored HoldAuction Arguments (#1570) * Fix bug in request.imp.ext Validation (#1575) * First draft * Brian's reivew * Removed leftover comments Co-authored-by: Gus Carreon <[email protected]> * Bugfix: default admin port is 6060 (#1595) * Add timestamp to analytics and response.ext.prebid.auctiontimestamp l… (#1584) * Added app capabilities to VerizonMedia adapter (#1596) Co-authored-by: oath-jac <[email protected]> * New Adapter Initialization Framework (#1532) * Fix 33Across App Handling (#1602) * Fix adapter JSON tests to have the right test structure (#1589) * Fix JSON EMX Digital * Fix JSON Brightroll * Fix JSON Beintoo * Fix JSON Gamoshi * Fix JSON Kubient * Fix JSON Marsmedia * Fix JSON Nanointeractive * Fix JSON Telaria * Fix JSON valueimpression * Fix JSON smartyads * Fix JSON rhythmone * Fix JSON krushmedia * Fix JSON cpmstar * Fix JSON acuityads * Fix JSON avocet * Rename wrongly named acuity ads test file * Fix JSON gamma * Add expected no bid responses * Fixed indentation and asesome-markup * Added usersync support to Between SSP adapter; Major fixes and refactor (#1587) Co-authored-by: Egor Skorokhodov <[email protected]> * Removed Safari Metric (#1571) * Deepintent adapter (#1524) Co-authored-by: Sourabh Gandhe <[email protected]> * update mobilefuse endpoint (#1606) Co-authored-by: Dan Barnett <[email protected]> * Fix Missing Consumable Clock (#1610) * Remove Hook Scripts (#1614) * Add config gdpr.amp_exception deprecation warning (#1612) * Refactor Adapter Config To Its Own File (#1608) * RP adapter: use video placement parameter to set size ID (#1607) * Add a BidderRequest struct to hold bidder specific request info (#1611) * Add warning that gdpr checks will be skipped when gdpr.host_vendor_id… (#1615) * Add TLS Handshake connection metrics (#1613) * Improve GitHub Actions Validation (#1590) * Move SSL to Server directory (#1625) * Rename currencies to currency (#1626) * Deepintent: Params normalization (#1617) Co-authored-by: Sourabh Gandhe <[email protected]> * Set Kubient email to [email protected] (#1629) * Rename pbsmetrics to metrics (#1624) * 33Across: Add support for multi-imp requests (#1609) * changed usersync endpoint (#1631) Co-authored-by: Sourabh Gandhe <[email protected]> * Remove legacy GDPR AMP config flag used to prevent buyer ID scrub on AMP requests (#1565) * Updating contact info for adprime (#1640) * ucfunnel adapter update end point (#1639) * New Adapter: Mobfox (#1585) Co-authored-by: mobfox <[email protected]> * IX: Implement Bidder interface, update endpoint. (#1569) Co-authored-by: Index Exchange Prebid Team <[email protected]> * Fix GDPR consent assumption when gdpr req signal is unambiguous and s… (#1591) * Fix GDPR consent assumption when gdpr req signal is unambiguous and set to 1 and consent string is blank * Refactor TestAllowPersonalInfo to make it table-based and add empty consent string cases * Update PersonalInfoAllowed to allow PI if the request indicates GDPR does not apply * Update test descriptions * Update default vendor permissions to only allow PI based on UserSyncIfAmbiguous if request GDPR signal is ambiguous * Change GDPR request signal type name and other PR feedback code style changes * Rename GDPR package signal constants and consolidate gdprEnforced and gdprEnabled variables * Hoist GDPR signal/empty consent checks before vendor list check * Rename gdpr to gdprSignal in Permissions interface and implementations * Fix merge mistakes * Update gdpr logic to set the gdpr signal when ambiguous according to the config flag * Add userSyncIfAmbiguous to all test cases in TestAllowPersonalInfo * Simplify TestAllowPersonalInfo * Fix appnexus adapter not setting currency in the bid response (#1642) Co-authored-by: Gus <[email protected]> * Add Adot adapter (#1605) Co-authored-by: Aurélien Giudici <[email protected]> * Refactor AMP Param Parsing (#1627) * Refactor AMP Param Parsing * Added Tests * Enforce GDPR privacy if there's an error parsing consent (#1593) * Enforce GDPR privacy if there's an error parsing consent * Update test with consent string variables to improve readability * Fix test typo * Update test variable names to follow go conventions * MediaFuse adapter (#1635) * MediaFuse alias * Syncer and tests * gvlid * gvlid * new mail * New Adapter: Revcontent (#1622) * Fix Unruly Bidder Parmaters (#1616) * Implement EID Permissions (#1633) * Implement EID Permissions * Idsync removal (#1644) Co-authored-by: steve-a-districtm <[email protected]> Co-authored-by: Steve Alliance <[email protected]> * Audit beachfront tests and change some videoResponseType details (#1638) * Adding Events support in bid responses (#1597) * Fix Shared Memory Corruption In EMX_Digital (#1646) * Add gdpr.tcf1.fetch_gvl deprecation warning and update GVL subdomain (#1660) * Bubble up GDPR signal/consent errors while applying privacy policies (#1651) * Always sync when GDPR globally enabled and allow host cookie sync … (#1656) * Eplanning: new prioritization metric for adunit sizes (#1648) * Eplanning: new prioritization metric for adunit sizes * removing IX's usersync default URL (#1670) Co-authored-by: Index Exchange Prebid Team <[email protected]> * AMX Bid Adapter: Loop Variable Bug (#1675) * requestheaders: new parameter inside debug.httpcalls.<BIDDER> to log request header details (#1659) * Added support for logging requestheaders inside httpCalls.requestheaders * Reverterd test case change * Modified outgoing mock request for appnexus, to send some request header information. Modified sample mock response such that ext.debug.httpcalls.appnexus.requestheaders will return the information of passed request headers * Addressed code review comments given by SyntaxNode. Also Moved RequestHeaders next to RequestBidy in openrtb_ext.ExtHttpCall Co-authored-by: Shriprasad <[email protected]> * Updating pulsepoint adapter (#1663) * Debug disable feature implementation: (#1677) Co-authored-by: Veronika Solovei <[email protected]> * Always use fallback GVL for TCF1 (#1657) * Update TCF2 GVL subdomain and always use fallback GVL for TCF1 * Add config test coverage for invalid TCF1 FetchGVL and AMP Exception * Delete obselete test * Adform adapter: digitrust cleanup (#1690) * adform secure endpoint as default setting * digitrust cleanup * New Adapter: DecenterAds (#1669) Co-authored-by: vlad <[email protected]> * Handle empty consent string during cookie sync and setuid (#1671) * Handle empty consent string during cookie sync and setuid * Remove todo comment * Make auction test table driven and convert GDPR impl normalize method to pass by value * Moved legacy auction endpoint signal parsing into its own method and removed unnecessary test cases * Fix SignalParse method to return nil for error when raw signal is empty and other PR feedback * Tappx User Syncer + Site Update (#1674) Co-authored-by: ubuntu <[email protected]> Co-authored-by: Albert Grandes <[email protected]> * Beachfront Additional tests (#1679) * added place holder files for all but a couple of the intended new tests. I need to grok what those couple mean before being able to name a file. * This covers most of the suggested cases and a couple more that occured to me. I'll look at the couple that I held off on next. * added the unmarshal tests and found a couple problems to address in the process. * removed my __debug_bin. should be in gitignore. * A bit of clean up and commenting. Bumped version number. Added __debug_bin to .gitignore. This is the debugging binary created by Visual Studio Code, or at least version 1.52.1. * missed a bunch of version strings * removed IP faker * If IP is not included in an AdM request, an error is now thrown for the AdM imp instead of faking it. The AdM endpoint is the only one that requires an IP. Also, added several "no-ip" test cases. * Whent back to the fake IP solution instead of the error. Removed most of the "no-ip" test cases, leaving one. * changed ip in adm-video.json to not match the faker ip * removed a debugging comment * New Adapter: Onetag (#1695) * Pubmatic: Trimming publisher ID before passing (#1685) * Trimming publisher ID before passing * Fix typos in nobid.json (#1704) * Fix Typo In Adform Bidder Params (#1705) * Don't Load GVL v1 for TCF2 (+ TCF1 Cleanup) (#1693) * Typo fix for connectad bidder params (#1706) * Typo fix for invibes bidder params (#1707) * Typo fix nanointeractive bidder params (#1708) * Isolate /info/bidders Data Model + Add Uses HTTPS Flag (#1692) * Initial Commit * Merge Conflict Fixes * Removed Unncessary JSON Attributes * Removed Dev Notes * Add Missing validateDefaultAliases Test * Improved Reversed Test * Remove Var Scope Confusion * Proper Tests For Bidder Param Validator * Removed Unused Test Setup * New Adapter: Epom (#1680) Co-authored-by: Vasyl Zarva <[email protected]> * New Adapter: Pangle (#1697) Co-authored-by: hcai <[email protected]> * Fix Merge Conflict (#1714) * GumGum: adds pubId and irisid properties/parameters (#1664) * adds pubId and irisid properties * updates per naming convention & makes a video copy * updates when to copy banner, adds Publisher fallback and multiformat request * adds more json tests * rename the json file to remove whitespaces * Accommodate Apple iOS LMT bug (#1718) * New Adapter: jixie (#1698) * initial commit * added notes file for temp use * jixie adapter development work * jixie adaptor development work: mainly the test json files but also the jixie usersync code * added a test case with accountid. and cosmetic line changes in the banner*json test file * updated the jixie user sync: the endpoint and some params stuf * tks and fixing per comments on pull request 1698 * responding to guscarreon's comments: -more checking in makerequest of the bidder params (added 2 more test jsons) -removed blank lines, lines commented out -test_params: a case with unit alone -BadInput error * responding to review. put condition on jixie unit string in the bidder-params/jixie.json file. removed checking in jixie.go that has become unnecssary. removed unnec test cases. updated params-test * added one failed params test * removed a function that I no longer call! * renamed JixieAdapter to adapter * removed bidfloor from jixie explicit ext params * Fix Regs Nil Condition (#1723) * Mobfox: Add rout to adexcange (#1702) Co-authored-by: mobfox <[email protected]> * New Adapter: TrustX (#1726) * New Adapter: UNICORN (#1719) * add bidder-info, bidder-params for UNICORN * Add adapter * Fixes GDPR bug about being overly strict on publisher restrictions (#1730) * 33Across: Updated exchange endpoint (#1738) * New Adapter: Adyoulike (#1700) Co-authored-by: Damien Dumas <[email protected]> * Hoist GVL ID To Bidder Info (#1721) * Improve Digital adapter: add support for native ads (#1746) * Add Support For SkAdN + Refactor Split Imps (#1741) * No Longer Move bid.ext To bid.ext.bidder (#1742) * No Longer Move bid.ext To bid.ext.bidder * Remove Similar Behavior From seatbid.ext * Avoid Second Bid Copy * Removed Unused seatbid.ext * Typo fix: adyoulike bidder param debug description (#1755) * Aliases: Better Error Message For Disabled Bidder (#1751) * beachfront: Changes to support real 204 (#1737) * Fix race condition in 33across.go (#1757) Co-authored-by: Gus Carreon <[email protected]> * Revert "Fix race condition in 33across.go (#1757)" (#1763) This reverts commit bdf1e7b3e13bdf87d3282bf74472fc66504537d5. * Replace TravisCI With GitHub Actions (#1754) * Initial Commit * Finished Configuration * Remove TravisCI * Remove TravisCI * Fix Go Version Badge * Correct Fix For Go Version Badge * Removed Custom Config File Name * Debug warnings (#1724) Co-authored-by: Veronika Solovei <[email protected]> * Rubicon: Support sending segments to XAPI (#1752) Co-authored-by: Serhii Nahornyi <[email protected]> * validateNativeContextTypes function test cases (#1743) * Applogy: Fix Shared Memory Overwriting (#1758) * Pubmatic: Fix Shared Memory Overwriting (#1759) * Beachfront: Fix Shared Memory Overwriting (#1762) * Fix race condition in Beachfront adapter * Removed nil check and simplified * FPD: Allow imp.ext.data To Passthrough To Adapters (#1765) * Smaato: Add support for app (#1767) Co-authored-by: Bernhard Pickenbrock <[email protected]> * Update sync types (#1770) * 33across: Fix Shared Memory Overwriting (#1764) This reverts commit f7df258f061788ef7e72529115aa5fd554fa9f16. * Fix race condition in Yeahmobi adapter (#1761) Co-authored-by: Gus Carreon <[email protected]> * Pubnative: Fix Shared Memory Overwriting (#1760) * Add request for registration (#1780) * Update OpenRTB Library (#1733) * Tappx changes - Backward compatible change of version (#1777) Co-authored-by: ubuntu <[email protected]> Co-authored-by: Albert Grandes <[email protected]> * DMX: Enforcing w and h in imp (#17…
1 parent 3313f91 commit f21e051

File tree

9 files changed

+153
-86
lines changed

9 files changed

+153
-86
lines changed

‎exchange/bidder.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -521,7 +521,7 @@ func (bidder *bidderAdapter) addClientTrace(ctx context.Context) context.Context
521521
TLSHandshakeDone: func(tls.ConnectionState, error) {
522522
tlsHandshakeTime := time.Now().Sub(tlsStart)
523523

524-
bidder.me.RecordTLSHandshakeTime(tlsHandshakeTime)
524+
bidder.me.RecordTLSHandshakeTime(bidder.BidderName, tlsHandshakeTime)
525525
},
526526
}
527527
return httptrace.WithClientTrace(ctx, trace)

‎exchange/bidder_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1523,7 +1523,7 @@ func TestCallRecordDNSTime(t *testing.T) {
15231523
func TestCallRecordTLSHandshakeTime(t *testing.T) {
15241524
// setup a mock metrics engine and its expectation
15251525
metricsMock := &metrics.MetricsEngineMock{}
1526-
metricsMock.Mock.On("RecordTLSHandshakeTime", mock.Anything).Return()
1526+
metricsMock.Mock.On("RecordTLSHandshakeTime", mock.Anything, mock.Anything).Return()
15271527

15281528
// Instantiate the bidder that will send the request. We'll make sure to use an
15291529
// http.Client that runs our mock RoundTripper so DNSDone(httptrace.DNSDoneInfo{})

‎metrics/config/metrics.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,9 +147,9 @@ func (me *MultiMetricsEngine) RecordDNSTime(dnsLookupTime time.Duration) {
147147
}
148148
}
149149

150-
func (me *MultiMetricsEngine) RecordTLSHandshakeTime(tlsHandshakeTime time.Duration) {
150+
func (me *MultiMetricsEngine) RecordTLSHandshakeTime(bidderName openrtb_ext.BidderName, tlsHandshakeTime time.Duration) {
151151
for _, thisME := range *me {
152-
thisME.RecordTLSHandshakeTime(tlsHandshakeTime)
152+
thisME.RecordTLSHandshakeTime(bidderName, tlsHandshakeTime)
153153
}
154154
}
155155

@@ -338,7 +338,7 @@ func (me *DummyMetricsEngine) RecordDNSTime(dnsLookupTime time.Duration) {
338338
}
339339

340340
// RecordTLSHandshakeTime as a noop
341-
func (me *DummyMetricsEngine) RecordTLSHandshakeTime(tlsHandshakeTime time.Duration) {
341+
func (me *DummyMetricsEngine) RecordTLSHandshakeTime(bidderName openrtb_ext.BidderName, tlsHandshakeTime time.Duration) {
342342
}
343343

344344
// RecordAdapterBidReceived as a noop

‎metrics/go_metrics.go

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ type Metrics struct {
3131
StoredImpCacheMeter map[CacheResult]metrics.Meter
3232
AccountCacheMeter map[CacheResult]metrics.Meter
3333
DNSLookupTimer metrics.Timer
34-
TLSHandshakeTimer metrics.Timer
3534

3635
// Metrics for OpenRTB requests specifically. So we can track what % of RequestsMeter are OpenRTB
3736
// and know when legacy requests have been abandoned.
@@ -101,6 +100,7 @@ type AdapterMetrics struct {
101100
ConnCreated metrics.Counter
102101
ConnReused metrics.Counter
103102
ConnWaitTime metrics.Timer
103+
TLSHandshakeTimer metrics.Timer
104104
}
105105

106106
type MarkupDeliveryMetrics struct {
@@ -131,18 +131,18 @@ func NewBlankMetrics(registry metrics.Registry, exchanges []openrtb_ext.BidderNa
131131
blankTimer := &metrics.NilTimer{}
132132

133133
newMetrics := &Metrics{
134-
MetricsRegistry: registry,
135-
RequestStatuses: make(map[RequestType]map[RequestStatus]metrics.Meter),
136-
ConnectionCounter: metrics.NilCounter{},
137-
ConnectionAcceptErrorMeter: blankMeter,
138-
ConnectionCloseErrorMeter: blankMeter,
139-
ImpMeter: blankMeter,
140-
LegacyImpMeter: blankMeter,
141-
AppRequestMeter: blankMeter,
142-
NoCookieMeter: blankMeter,
143-
RequestTimer: blankTimer,
144-
DNSLookupTimer: blankTimer,
145-
TLSHandshakeTimer: blankTimer,
134+
MetricsRegistry: registry,
135+
RequestStatuses: make(map[RequestType]map[RequestStatus]metrics.Meter),
136+
ConnectionCounter: metrics.NilCounter{},
137+
ConnectionAcceptErrorMeter: blankMeter,
138+
ConnectionCloseErrorMeter: blankMeter,
139+
ImpMeter: blankMeter,
140+
LegacyImpMeter: blankMeter,
141+
AppRequestMeter: blankMeter,
142+
NoCookieMeter: blankMeter,
143+
RequestTimer: blankTimer,
144+
DNSLookupTimer: blankTimer,
145+
//TLSHandshakeTimer: blankTimer,
146146
RequestsQueueTimer: make(map[RequestType]map[bool]metrics.Timer),
147147
PrebidCacheRequestTimerSuccess: blankTimer,
148148
PrebidCacheRequestTimerError: blankTimer,
@@ -243,7 +243,7 @@ func NewMetrics(registry metrics.Registry, exchanges []openrtb_ext.BidderName, d
243243
newMetrics.AppRequestMeter = metrics.GetOrRegisterMeter("app_requests", registry)
244244
newMetrics.RequestTimer = metrics.GetOrRegisterTimer("request_time", registry)
245245
newMetrics.DNSLookupTimer = metrics.GetOrRegisterTimer("dns_lookup_time", registry)
246-
newMetrics.TLSHandshakeTimer = metrics.GetOrRegisterTimer("tls_handshake_time", registry)
246+
//newMetrics.TLSHandshakeTimer = metrics.GetOrRegisterTimer("tls_handshake_time", registry)
247247
newMetrics.PrebidCacheRequestTimerSuccess = metrics.GetOrRegisterTimer("prebid_cache_request_time.ok", registry)
248248
newMetrics.PrebidCacheRequestTimerError = metrics.GetOrRegisterTimer("prebid_cache_request_time.err", registry)
249249

@@ -319,6 +319,7 @@ func makeBlankAdapterMetrics(disabledMetrics config.DisabledMetrics) *AdapterMet
319319
newAdapter.ConnCreated = metrics.NilCounter{}
320320
newAdapter.ConnReused = metrics.NilCounter{}
321321
newAdapter.ConnWaitTime = &metrics.NilTimer{}
322+
newAdapter.TLSHandshakeTimer = &metrics.NilTimer{}
322323
}
323324
for _, err := range AdapterErrors() {
324325
newAdapter.ErrorMeters[err] = blankMeter
@@ -357,6 +358,7 @@ func registerAdapterMetrics(registry metrics.Registry, adapterOrAccount string,
357358
am.ConnCreated = metrics.GetOrRegisterCounter(fmt.Sprintf("%[1]s.%[2]s.connections_created", adapterOrAccount, exchange), registry)
358359
am.ConnReused = metrics.GetOrRegisterCounter(fmt.Sprintf("%[1]s.%[2]s.connections_reused", adapterOrAccount, exchange), registry)
359360
am.ConnWaitTime = metrics.GetOrRegisterTimer(fmt.Sprintf("%[1]s.%[2]s.connection_wait_time", adapterOrAccount, exchange), registry)
361+
am.TLSHandshakeTimer = metrics.GetOrRegisterTimer(fmt.Sprintf("%[1]s.%[2]s.tls_handshake_time", adapterOrAccount, exchange), registry)
360362
for err := range am.ErrorMeters {
361363
am.ErrorMeters[err] = metrics.GetOrRegisterMeter(fmt.Sprintf("%s.%s.requests.%s", adapterOrAccount, exchange, err), registry)
362364
}
@@ -559,8 +561,18 @@ func (me *Metrics) RecordDNSTime(dnsLookupTime time.Duration) {
559561
me.DNSLookupTimer.Update(dnsLookupTime)
560562
}
561563

562-
func (me *Metrics) RecordTLSHandshakeTime(tlsHandshakeTime time.Duration) {
563-
me.TLSHandshakeTimer.Update(tlsHandshakeTime)
564+
func (me *Metrics) RecordTLSHandshakeTime(adapterName openrtb_ext.BidderName, tlsHandshakeTime time.Duration) {
565+
if me.MetricsDisabled.AdapterConnectionMetrics {
566+
return
567+
}
568+
569+
am, ok := me.AdapterMetrics[adapterName]
570+
if !ok {
571+
glog.Errorf("Trying to log adapter TLS Handshake metrics for %s: adapter not found", string(adapterName))
572+
return
573+
}
574+
575+
am.TLSHandshakeTimer.Update(tlsHandshakeTime)
564576
}
565577

566578
// RecordAdapterBidReceived implements a part of the MetricsEngine interface.

‎metrics/go_metrics_test.go

Lines changed: 33 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -210,29 +210,51 @@ func TestRecordDNSTime(t *testing.T) {
210210
}
211211

212212
func TestRecordTLSHandshakeTime(t *testing.T) {
213+
type testIn struct {
214+
adapterName openrtb_ext.BidderName
215+
tLSHandshakeDuration time.Duration
216+
adapterMetricsEnabled bool
217+
}
218+
219+
type testOut struct {
220+
expectedDuration time.Duration
221+
}
222+
213223
testCases := []struct {
214-
description string
215-
tLSHandshakeDuration time.Duration
216-
expectedDuration time.Duration
224+
description string
225+
in testIn
226+
out testOut
217227
}{
218228
{
219-
description: "Five second TLS handshake time",
220-
tLSHandshakeDuration: time.Second * 5,
221-
expectedDuration: time.Second * 5,
229+
description: "Five second TLS handshake time",
230+
in: testIn{
231+
adapterName: openrtb_ext.BidderAppnexus,
232+
tLSHandshakeDuration: time.Second * 5,
233+
adapterMetricsEnabled: true,
234+
},
235+
out: testOut{
236+
expectedDuration: time.Second * 5,
237+
},
222238
},
223239
{
224-
description: "Zero TLS handshake time",
225-
tLSHandshakeDuration: time.Duration(0),
226-
expectedDuration: time.Duration(0),
240+
description: "Zero TLS handshake time",
241+
in: testIn{
242+
adapterName: openrtb_ext.BidderAppnexus,
243+
tLSHandshakeDuration: time.Duration(0),
244+
adapterMetricsEnabled: true,
245+
},
246+
out: testOut{
247+
expectedDuration: time.Duration(0),
248+
},
227249
},
228250
}
229251
for _, test := range testCases {
230252
registry := metrics.NewRegistry()
231253
m := NewMetrics(registry, []openrtb_ext.BidderName{openrtb_ext.BidderAppnexus}, config.DisabledMetrics{AccountAdapterDetails: true})
232254

233-
m.RecordTLSHandshakeTime(test.tLSHandshakeDuration)
255+
m.RecordTLSHandshakeTime(test.in.adapterName, test.in.tLSHandshakeDuration)
234256

235-
assert.Equal(t, test.expectedDuration.Nanoseconds(), m.TLSHandshakeTimer.Sum(), test.description)
257+
assert.Equal(t, test.out.expectedDuration.Nanoseconds(), m.AdapterMetrics[openrtb_ext.BidderAppnexus].TLSHandshakeTimer.Sum(), test.description)
236258
}
237259
}
238260

‎metrics/metrics.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ type MetricsEngine interface {
348348
RecordAdapterRequest(labels AdapterLabels)
349349
RecordAdapterConnections(adapterName openrtb_ext.BidderName, connWasReused bool, connWaitTime time.Duration)
350350
RecordDNSTime(dnsLookupTime time.Duration)
351-
RecordTLSHandshakeTime(tlsHandshakeTime time.Duration)
351+
RecordTLSHandshakeTime(adapterName openrtb_ext.BidderName, tlsHandshakeTime time.Duration)
352352
RecordAdapterPanic(labels AdapterLabels)
353353
// This records whether or not a bid of a particular type uses `adm` or `nurl`.
354354
// Since the legacy endpoints don't have a bid type, it can only count bids from OpenRTB and AMP.

‎metrics/metrics_mock.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,8 +72,8 @@ func (me *MetricsEngineMock) RecordDNSTime(dnsLookupTime time.Duration) {
7272
me.Called(dnsLookupTime)
7373
}
7474

75-
func (me *MetricsEngineMock) RecordTLSHandshakeTime(tlsHandshakeTime time.Duration) {
76-
me.Called(tlsHandshakeTime)
75+
func (me *MetricsEngineMock) RecordTLSHandshakeTime(bidderName openrtb_ext.BidderName, tlsHandshakeTime time.Duration) {
76+
me.Called(bidderName, tlsHandshakeTime)
7777
}
7878

7979
// RecordAdapterBidReceived mock

‎metrics/prometheus/prometheus.go

Lines changed: 43 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -15,33 +15,33 @@ type Metrics struct {
1515
Registry *prometheus.Registry
1616

1717
// General Metrics
18-
connectionsClosed prometheus.Counter
19-
connectionsError *prometheus.CounterVec
20-
connectionsOpened prometheus.Counter
21-
cookieSync prometheus.Counter
22-
impressions *prometheus.CounterVec
23-
impressionsLegacy prometheus.Counter
24-
prebidCacheWriteTimer *prometheus.HistogramVec
25-
requests *prometheus.CounterVec
26-
requestsTimer *prometheus.HistogramVec
27-
requestsQueueTimer *prometheus.HistogramVec
28-
requestsWithoutCookie *prometheus.CounterVec
29-
storedImpressionsCacheResult *prometheus.CounterVec
30-
storedRequestCacheResult *prometheus.CounterVec
31-
accountCacheResult *prometheus.CounterVec
32-
storedAccountFetchTimer *prometheus.HistogramVec
33-
storedAccountErrors *prometheus.CounterVec
34-
storedAMPFetchTimer *prometheus.HistogramVec
35-
storedAMPErrors *prometheus.CounterVec
36-
storedCategoryFetchTimer *prometheus.HistogramVec
37-
storedCategoryErrors *prometheus.CounterVec
38-
storedRequestFetchTimer *prometheus.HistogramVec
39-
storedRequestErrors *prometheus.CounterVec
40-
storedVideoFetchTimer *prometheus.HistogramVec
41-
storedVideoErrors *prometheus.CounterVec
42-
timeoutNotifications *prometheus.CounterVec
43-
dnsLookupTimer prometheus.Histogram
44-
tlsHandhakeTimer prometheus.Histogram
18+
connectionsClosed prometheus.Counter
19+
connectionsError *prometheus.CounterVec
20+
connectionsOpened prometheus.Counter
21+
cookieSync prometheus.Counter
22+
impressions *prometheus.CounterVec
23+
impressionsLegacy prometheus.Counter
24+
prebidCacheWriteTimer *prometheus.HistogramVec
25+
requests *prometheus.CounterVec
26+
requestsTimer *prometheus.HistogramVec
27+
requestsQueueTimer *prometheus.HistogramVec
28+
requestsWithoutCookie *prometheus.CounterVec
29+
storedImpressionsCacheResult *prometheus.CounterVec
30+
storedRequestCacheResult *prometheus.CounterVec
31+
accountCacheResult *prometheus.CounterVec
32+
storedAccountFetchTimer *prometheus.HistogramVec
33+
storedAccountErrors *prometheus.CounterVec
34+
storedAMPFetchTimer *prometheus.HistogramVec
35+
storedAMPErrors *prometheus.CounterVec
36+
storedCategoryFetchTimer *prometheus.HistogramVec
37+
storedCategoryErrors *prometheus.CounterVec
38+
storedRequestFetchTimer *prometheus.HistogramVec
39+
storedRequestErrors *prometheus.CounterVec
40+
storedVideoFetchTimer *prometheus.HistogramVec
41+
storedVideoErrors *prometheus.CounterVec
42+
timeoutNotifications *prometheus.CounterVec
43+
dnsLookupTimer prometheus.Histogram
44+
//tlsHandhakeTimer prometheus.Histogram
4545
privacyCCPA *prometheus.CounterVec
4646
privacyCOPPA *prometheus.CounterVec
4747
privacyLMT *prometheus.CounterVec
@@ -62,6 +62,7 @@ type Metrics struct {
6262
adapterConnectionWaitTime *prometheus.HistogramVec
6363
adapterDuplicateBidIDCounter *prometheus.CounterVec
6464
adapterVideoBidDuration *prometheus.HistogramVec
65+
tlsHandhakeTimer *prometheus.HistogramVec
6566

6667
// Account Metrics
6768
accountRequests *prometheus.CounterVec
@@ -283,10 +284,10 @@ func NewMetrics(cfg config.PrometheusMetrics, disabledMetrics config.DisabledMet
283284
"Seconds to resolve DNS",
284285
standardTimeBuckets)
285286

286-
metrics.tlsHandhakeTimer = newHistogram(cfg, metrics.Registry,
287-
"tls_handshake_time",
288-
"Seconds to perform TLS Handshake",
289-
standardTimeBuckets)
287+
//metrics.tlsHandhakeTimer = newHistogram(cfg, metrics.Registry,
288+
// "tls_handshake_time",
289+
// "Seconds to perform TLS Handshake",
290+
// standardTimeBuckets)
290291

291292
metrics.privacyCCPA = newCounter(cfg, metrics.Registry,
292293
"privacy_ccpa",
@@ -355,6 +356,12 @@ func NewMetrics(cfg config.PrometheusMetrics, disabledMetrics config.DisabledMet
355356
"Seconds from when the connection was requested until it is either created or reused",
356357
[]string{adapterLabel},
357358
standardTimeBuckets)
359+
360+
metrics.tlsHandhakeTimer = newHistogramVec(cfg, metrics.Registry,
361+
"tls_handshake_time",
362+
"Seconds to perform TLS Handshake",
363+
[]string{adapterLabel},
364+
standardTimeBuckets)
358365
}
359366

360367
metrics.adapterRequestsTimer = newHistogramVec(cfg, metrics.Registry,
@@ -622,8 +629,11 @@ func (m *Metrics) RecordDNSTime(dnsLookupTime time.Duration) {
622629
m.dnsLookupTimer.Observe(dnsLookupTime.Seconds())
623630
}
624631

625-
func (m *Metrics) RecordTLSHandshakeTime(tlsHandshakeTime time.Duration) {
626-
m.tlsHandhakeTimer.Observe(tlsHandshakeTime.Seconds())
632+
func (m *Metrics) RecordTLSHandshakeTime(adapterName openrtb_ext.BidderName, tlsHandshakeTime time.Duration) {
633+
//m.tlsHandhakeTimer.Observe(tlsHandshakeTime.Seconds())
634+
m.tlsHandhakeTimer.With(prometheus.Labels{
635+
adapterLabel: string(adapterName),
636+
}).Observe(tlsHandshakeTime.Seconds())
627637
}
628638

629639
func (m *Metrics) RecordAdapterPanic(labels metrics.AdapterLabels) {

0 commit comments

Comments
 (0)