Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UOE-6240: Send gpt slot name in extension field #151

Merged
merged 101 commits into from
Apr 30, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
101 commits
Select commit Hold shift + click to select a range
67b9c25
Tappx User Syncer + Site Update (#1674)
prebidtappx Feb 11, 2021
56dfc60
Beachfront Additional tests (#1679)
muncha Feb 11, 2021
e93a781
New Adapter: Onetag (#1695)
onetag-dev Feb 11, 2021
7ada266
Pubmatic: Trimming publisher ID before passing (#1685)
sachin-pubmatic Feb 11, 2021
bd61dcd
Fix typos in nobid.json (#1704)
agilfix Feb 16, 2021
42ab0d6
Fix Typo In Adform Bidder Params (#1705)
agilfix Feb 16, 2021
cda3f0f
Don't Load GVL v1 for TCF2 (+ TCF1 Cleanup) (#1693)
SyntaxNode Feb 16, 2021
e87c43d
Typo fix for connectad bidder params (#1706)
agilfix Feb 16, 2021
e75df55
Typo fix for invibes bidder params (#1707)
agilfix Feb 16, 2021
af466fd
Typo fix nanointeractive bidder params (#1708)
agilfix Feb 16, 2021
60622de
Isolate /info/bidders Data Model + Add Uses HTTPS Flag (#1692)
SyntaxNode Feb 18, 2021
30b5b9a
New Adapter: Epom (#1680)
epomrnd Feb 18, 2021
ad943a7
New Adapter: Pangle (#1697)
chshpra Feb 18, 2021
0fd24ef
Fix Merge Conflict (#1714)
SyntaxNode Feb 18, 2021
bc808a4
GumGum: adds pubId and irisid properties/parameters (#1664)
susyt Feb 24, 2021
b74d7c0
Accommodate Apple iOS LMT bug (#1718)
SyntaxNode Feb 25, 2021
fc4bb44
New Adapter: jixie (#1698)
jxdeveloper1 Feb 25, 2021
e0c1ac5
Fix Regs Nil Condition (#1723)
SyntaxNode Feb 25, 2021
f3893c3
Mobfox: Add rout to adexcange (#1702)
mobfxoHB Feb 25, 2021
dc14698
New Adapter: TrustX (#1726)
TheMediaGrid Mar 3, 2021
ee2ec39
New Adapter: UNICORN (#1719)
faithnh Mar 4, 2021
87277e1
Fixes GDPR bug about being overly strict on publisher restrictions (#…
hhhjort Mar 4, 2021
a3cc810
33Across: Updated exchange endpoint (#1738)
curlyblueeagle Mar 5, 2021
c15c66c
New Adapter: Adyoulike (#1700)
guiann Mar 7, 2021
5a0251a
Hoist GVL ID To Bidder Info (#1721)
SyntaxNode Mar 9, 2021
49d84cc
Improve Digital adapter: add support for native ads (#1746)
jbartek25 Mar 11, 2021
849a311
Add Support For SkAdN + Refactor Split Imps (#1741)
SyntaxNode Mar 11, 2021
e53fd87
No Longer Move bid.ext To bid.ext.bidder (#1742)
SyntaxNode Mar 11, 2021
549d4b2
Typo fix: adyoulike bidder param debug description (#1755)
agilfix Mar 16, 2021
5b1a919
Aliases: Better Error Message For Disabled Bidder (#1751)
SyntaxNode Mar 17, 2021
fc87d1d
beachfront: Changes to support real 204 (#1737)
muncha Mar 17, 2021
bdf1e7b
Fix race condition in 33across.go (#1757)
guscarreon Mar 18, 2021
f7df258
Revert "Fix race condition in 33across.go (#1757)" (#1763)
SyntaxNode Mar 18, 2021
eb6c0e6
Replace TravisCI With GitHub Actions (#1754)
SyntaxNode Mar 18, 2021
a04d5e1
Debug warnings (#1724)
VeronikaSolovei9 Mar 18, 2021
c675c18
Rubicon: Support sending segments to XAPI (#1752)
SerhiiNahornyi Mar 19, 2021
ca53bd5
validateNativeContextTypes function test cases (#1743)
guscarreon Mar 22, 2021
7c8148e
Applogy: Fix Shared Memory Overwriting (#1758)
guscarreon Mar 22, 2021
07aabef
Pubmatic: Fix Shared Memory Overwriting (#1759)
guscarreon Mar 22, 2021
2f1a0e0
Beachfront: Fix Shared Memory Overwriting (#1762)
guscarreon Mar 22, 2021
080843b
FPD: Allow imp.ext.data To Passthrough To Adapters (#1765)
SyntaxNode Mar 23, 2021
8760bae
Smaato: Add support for app (#1767)
el-chuck Mar 23, 2021
bea52c6
Update sync types (#1770)
GeneGenie Mar 23, 2021
b9d28e7
33across: Fix Shared Memory Overwriting (#1764)
guscarreon Mar 24, 2021
ef32c8b
Fix race condition in Yeahmobi adapter (#1761)
guscarreon Mar 25, 2021
bcfe9f2
Pubnative: Fix Shared Memory Overwriting (#1760)
guscarreon Mar 25, 2021
6a3a8b8
Add request for registration (#1780)
bretg Mar 25, 2021
192f55b
Update OpenRTB Library (#1733)
SyntaxNode Mar 26, 2021
690fe2d
Tappx changes - Backward compatible change of version (#1777)
prebidtappx Mar 30, 2021
056b7cc
DMX: Enforcing w and h in imp (#1778)
stevealliance Mar 31, 2021
cbc3e84
Remove Authorization Headers From Debug Response (#1779)
SyntaxNode Apr 1, 2021
6fa5771
New Adapter: Bidmachine (#1769)
meeeeeepo Apr 1, 2021
8193e30
New Adapter: Criteo (#1775)
benjaminch Apr 1, 2021
7cf60db
Fix shared memory issue when stripping authorization header from bid …
bsardo Apr 6, 2021
245accf
RTB House: update parameters (#1785)
piwanczak Apr 7, 2021
5708943
Generate seatbid[].bid[].ext.prebid.bidid (#1772)
VeronikaSolovei9 Apr 8, 2021
adb4044
Basic GDPR enforcement for specific publisher-vendors. (#1782)
hhhjort Apr 8, 2021
28de9fd
New Adapter: Zemanta (#1774)
rokostik Apr 8, 2021
aad9798
Zemanta: Rename Adapter To Outbrain (#1797)
Apr 9, 2021
c0a85f7
Update openrtb library to v15 (#1802)
Apr 14, 2021
cc84f02
IX: Set bidVideo when category and duration is available (#1794)
ixjohnny Apr 14, 2021
22191e6
Update IX defaults (#1799)
mlb7687 Apr 14, 2021
bdfbc32
Update Adyoulike endpoint to hit production servers (#1805)
guiann Apr 14, 2021
5bec86b
Openx: use bidfloor if set - prebid.js adapter behavior (#1795)
laurb9 Apr 14, 2021
398e1ca
[ORBIDDER] add gvlVendorID and set bid response currency (#1798)
arneschulz1984 Apr 14, 2021
1628e1a
New Adapter: ADXCG (#1803)
adxcgcom Apr 15, 2021
b3b6099
Update kidoz properties to type string (#1808)
agilfix Apr 15, 2021
51822e1
Update bidmachine properties to type string (#1809)
agilfix Apr 15, 2021
c7b6463
transform native eventtrackers to imptrackers and jstracker (#1811)
Apr 16, 2021
d384e91
TheMediaGrid: Added processing of imp[].ext.data (#1807)
TheMediaGrid Apr 20, 2021
d8fa9d6
Renaming package github.com/PubMatic-OpenWrap/openrtb to github.com/m…
sachin-pubmatic Apr 25, 2021
b40c4a4
Rename package github.com/PubMatic-OpenWrap/prebid-server to github.c…
sachin-pubmatic Apr 26, 2021
b29c645
Merged prebid-0.157.0
sachin-pubmatic Apr 27, 2021
28d9cfa
UOE-6196: OpenWrap S2S: Remove adpod_id from AppNexus adapter
sachin-pubmatic Apr 28, 2021
7d0afbc
Refactored code and fixed indentation
sachin-pubmatic Apr 28, 2021
bff555c
Fixed indentation for json files
sachin-pubmatic Apr 28, 2021
ba43f62
Fixed indentation for json files
sachin-pubmatic Apr 28, 2021
f62cd27
Fixed import in adapters/gumgum/gumgum.go
sachin-pubmatic Apr 28, 2021
af9a43a
Reverted unwanted changes in test json files
sachin-pubmatic Apr 28, 2021
c2ed9d8
Fixed unwanted git merge changes
sachin-pubmatic Apr 28, 2021
1efc3bf
Added missing field SkipDedup in ExtIncludeBrandCategory
sachin-pubmatic Apr 28, 2021
2273d69
Added missing Bidder field in ExtBid type
sachin-pubmatic Apr 28, 2021
b202980
Exposing CookieSyncRequest for header-bidding
sachin-pubmatic Apr 28, 2021
bccd2fa
Temporary path change for static folder
sachin-pubmatic Apr 28, 2021
4a85a11
Fixed static folder paths
sachin-pubmatic Apr 28, 2021
57db5c2
Fixed default value in config for usersync_if_ambiguous
sachin-pubmatic Apr 28, 2021
c1c7f1b
Fixed config after upgrade
sachin-pubmatic Apr 28, 2021
bdb4996
Updated router.go to uncomment defaultRequest validation
sachin-pubmatic Apr 28, 2021
21f070d
Fixed path for accounts.filesystem.directorypath
sachin-pubmatic Apr 28, 2021
01597f2
Fixed diff with OW
sachin-pubmatic Apr 28, 2021
7d1e416
Added DMX default usersync URL
sachin-pubmatic Apr 29, 2021
5f98e43
Merged ci
sachin-pubmatic Apr 29, 2021
d4bba53
Reverted Dmx default usersync url, Will add it in properties file
sachin-pubmatic Apr 29, 2021
28f9fdc
Added DMX usersync url
sachin-pubmatic Apr 29, 2021
99ffdc4
Merged ci
sachin-pubmatic Apr 29, 2021
86f2498
Adding changes missed for UOE-5114 during prebid-server upgrade
sachin-pubmatic Apr 30, 2021
54a82a2
Merge branch 'ci' into UOE-6319-ci
sachin-pubmatic Apr 30, 2021
2463617
Adding changes missed for UOE-5114 during prebid-server upgrade
sachin-pubmatic Apr 30, 2021
5796e55
UOE-6240: Send gpt slot name in extension field
sachin-pubmatic Apr 30, 2021
51fed72
Merge branch 'ci' into UOE-6240-ci-new
sachin-pubmatic Apr 30, 2021
efa36ab
Merge branch 'UOE-6240-new' into UOE-6240-ci-new
sachin-pubmatic Apr 30, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion adapters/bidder.go
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ type ExtImpBidder struct {
//
// Bidder implementations may safely assume that this JSON has been validated by their
// static/bidder-params/{bidder}.json file.
Bidder json.RawMessage `json:"bidder"`
Bidder json.RawMessage `json:"bidder"`
Data *openrtb_ext.ExtData `json:"data,omitempty"`
}

func (r *RequestData) SetBasicAuth(username string, password string) {
Expand Down
7 changes: 7 additions & 0 deletions adapters/pubmatic/pubmatic.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ const (
buyIdTargetingKey = "hb_buyid_pubmatic"
skAdnetworkKey = "skadn"
rewardKey = "reward"
ImpExtAdUnitKey = "dfp_ad_unit_code"
AdServerGAM = "gam"
)

type PubmaticAdapter struct {
Expand Down Expand Up @@ -631,6 +633,11 @@ func parseImpressionObject(imp *openrtb2.Imp, wrapExt *pubmaticWrapperExt, pubID
}
}

if bidderExt.Data != nil && bidderExt.Data.AdServer != nil &&
bidderExt.Data.AdServer.Name == AdServerGAM && bidderExt.Data.AdServer.AdSlot != "" {
impExtMap[ImpExtAdUnitKey] = bidderExt.Data.AdServer.AdSlot
}

if len(impExtMap) != 0 {
impExtBytes, err := json.Marshal(impExtMap)
if err == nil {
Expand Down
174 changes: 174 additions & 0 deletions adapters/pubmatic/pubmatictest/supplemental/gptSlotNameInImpExt.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
{
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
]
},
"ext": {
"bidder": {
"adSlot": "AdTag_Div1@300x250",
"publisherId": "999",
"keywords": [
{
"key": "pmZoneID",
"value": [
"Zone1",
"Zone2"
]
},
{
"key": "preference",
"value": [
"sports",
"movies"
]
}
],
"wrapper": {
"version": 1,
"profile": 5123
}
},
"data": {
"adserver": {
"name": "gam",
"adslot": "/1111/home"
}
}
}
}
],
"device": {
"ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"
},
"site": {
"id": "siteID",
"publisher": {
"id": "1234"
}
},
"ext": {
"prebid": {
"bidderparams": {
"wiid": "dwzafakjflan-tygannnvlla-mlljvj"
}
}
}
},
"httpCalls": [
{
"expectedRequest": {
"uri": "https://hbopenbid.pubmatic.com/translator?source=prebid-server",
"body": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"tagid": "AdTag_Div1",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
],
"h": 250,
"w": 300
},
"ext": {
"pmZoneID": "Zone1,Zone2",
"preference": "sports,movies",
"dfp_ad_unit_code": "/1111/home"
}
}
],
"device": {
"ua": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/63.0.3239.132 Safari/537.36"
},
"site": {
"id": "siteID",
"publisher": {
"id": "999"
}
},
"ext": {
"wrapper": {
"profile": 5123,
"version": 1,
"wiid": "dwzafakjflan-tygannnvlla-mlljvj"
}
}
}
},
"mockResponse": {
"status": 200,
"body": {
"id": "test-request-id",
"seatbid": [
{
"seat": "958",
"bid": [
{
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.500000,
"adid": "29681110",
"adm": "some-test-ad",
"adomain": [
"pubmatic.com"
],
"crid": "29681110",
"h": 250,
"w": 300,
"dealid": "test deal",
"ext": {
"dspid": 6,
"deal_channel": 1
}
}
]
}
],
"bidid": "5778926625248726496",
"cur": "USD"
}
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.5,
"adid": "29681110",
"adm": "some-test-ad",
"adomain": [
"pubmatic.com"
],
"crid": "29681110",
"w": 300,
"h": 250,
"dealid": "test deal",
"ext": {
"dspid": 6,
"deal_channel": 1
}
},
"type": "banner"
}
]
}
]
}
9 changes: 9 additions & 0 deletions openrtb_ext/imp.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,12 @@ type ExtImpPrebid struct {
type ExtStoredRequest struct {
ID string `json:"id"`
}

type ExtData struct {
AdServer *ExtAdServer `json:"adserver"`
}

type ExtAdServer struct {
Name string `json:"name"`
AdSlot string `json:"adslot"`
}