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

Update First Party Data workflow and introduce Bidder Config #573

Merged
merged 26 commits into from
Jun 3, 2020
Merged
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
e628e84
Update First Party Data workflow and introduce Bidder Config
RossGoncharuk Dec 23, 2019
e9a0782
Merge branch 'master' into fpd-update
RossGoncharuk Dec 23, 2019
a4395f8
Post-merge fix
RossGoncharuk Dec 23, 2019
791e9e1
Merge branch 'master' into fpd-update
RossGoncharuk Jan 16, 2020
c8d62ef
Fix post-merge errors
RossGoncharuk Jan 16, 2020
92887aa
Fix integration tests for new bidders
RossGoncharuk Jan 16, 2020
4984948
Merge branch 'master' into fpd-update
RossGoncharuk Jan 16, 2020
3b728dd
Fix post-merge errors
RossGoncharuk Jan 16, 2020
7e59386
Merge branch 'master' into fpd-update
RossGoncharuk Jan 16, 2020
bbfc9ef
Merge remote-tracking branch 'github-rubicon/master' into fpd-update
DGarbar Feb 5, 2020
176cc5e
Add tests to validate no mask
AndriyPavlyuk Feb 14, 2020
90e69af
Merge remote-tracking branch 'github-rubicon/fpd-update' into fpd-update
DGarbar Feb 19, 2020
965d4af
Handling of empty fpd json parameter
DGarbar Feb 19, 2020
0bc8cd7
Merge remote-tracking branch 'github-rubicon/master' into fpd-update
DGarbar Feb 19, 2020
32ca2f6
Fix tests
DGarbar Feb 19, 2020
00d7198
Add amp handling off targeting parameter
DGarbar Feb 19, 2020
c58b62c
Merge remote-tracking branch 'github-rubicon/master' into fpd-update
DGarbar Feb 20, 2020
90ebb6b
Merge remote-tracking branch 'github-rubicon/master' into fpd-update
DGarbar Feb 21, 2020
6399f6a
Minor refactoring
Mar 5, 2020
d2de2e5
Merge branch 'master' into fpd-update
Mar 13, 2020
6fd26e1
Merge branch 'master' into fpd-update
May 6, 2020
356a43d
Merge branch 'master' into fpd-update
May 22, 2020
5db231d
Merge branch 'master' into fpd-update
Jun 2, 2020
815e083
Make context field in imp.ext to be not required if null
Jun 3, 2020
d7b85ba
Revert test JSONs
Jun 3, 2020
9647883
Revert test JSONs
Jun 3, 2020
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
Prev Previous commit
Next Next commit
Fix integration tests for new bidders
  • Loading branch information
RossGoncharuk committed Jan 16, 2020
commit 92887aa7c98f077cfa3fb206482deec7548ebb10
Original file line number Diff line number Diff line change
@@ -47,7 +47,6 @@
"id": "publisherId"
}
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
Original file line number Diff line number Diff line change
@@ -89,149 +89,6 @@
],
"cur": "USD",
"ext": {
"debug": {
"httpcalls": {
"cache": [
{
"uri": "{{ cache.endpoint }}",
"requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adm\":\"adm001\",\"adid\":\"adid001\",\"cid\":\"cid001\",\"crid\":\"crid001\",\"w\":300,\"h\":250}},{\"type\":\"json\",\"value\":{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"adomain\":[\"psacentral.org\"],\"cid\":\"cid002\",\"crid\":\"crid002\",\"w\":300,\"h\":250}},{\"type\":\"xml\",\"value\":\"<VAST version=\\\"3.0\\\"><Ad><Wrapper><AdSystem>prebid.org wrapper</AdSystem><VASTAdTagURI><![CDATA[null]]></VASTAdTagURI><Impression></Impression><Creatives></Creatives></Wrapper></Ad></VAST>\",\"expiry\":120}]}",
"responsebody": "{\"responses\":[{\"uuid\":\"c1662cf6-f00a-4066-b71a-46d97abccc35\"},{\"uuid\":\"dbaa191c-5a56-4655-85eb-da079f94e09f\"},{\"uuid\":\"62019cff-d657-42fc-8366-16c34e1fd28c\"}]}",
"status": 200
}
],
"datablocks": [
{
"uri": "{{ datablocks.exchange_uri }}?sid=2",
"requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId002\",\"video\":{\"mimes\":[\"video/mp4\"],\"w\":300,\"h\":250,\"skipmin\":0,\"skipafter\":0,\"pos\":1},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":2}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"DB-UID\",\"ext\":{\"consent\":\"consentValue\",\"digitrust\":{\"id\":\"id\",\"keyv\":123,\"pref\":0}}},\"test\":1,\"at\":1,\"tmax\":1000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"currency\":{\"rates\":{\"EUR\":{\"USD\":1.2406},\"USD\":{\"EUR\":0.811}}},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}}}}}",
"responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid002\",\"impid\":\"impId002\",\"price\":9.99,\"crid\":\"crid002\",\"cid\":\"cid002\",\"adomain\":[\"psacentral.org\"],\"h\":250,\"w\":300}],\"seat\":\"datablocks\"}]}",
"status": 200
},
{
"uri": "{{ datablocks.exchange_uri }}?sid=1",
"requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"impId001\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}]},\"ext\":{\"bidder\":{\"host\":\"localhost:8090\",\"sourceId\":1}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"buyeruid\":\"DB-UID\",\"ext\":{\"consent\":\"consentValue\",\"digitrust\":{\"id\":\"id\",\"keyv\":123,\"pref\":0}}},\"test\":1,\"at\":1,\"tmax\":1000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"currency\":{\"rates\":{\"EUR\":{\"USD\":1.2406},\"USD\":{\"EUR\":0.811}}},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}}}}}",
"responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"bid001\",\"impid\":\"impId001\",\"price\":7.77,\"adid\":\"adid001\",\"crid\":\"crid001\",\"cid\":\"cid001\",\"adm\":\"adm001\",\"h\":250,\"w\":300}],\"seat\":\"datablocks\"}]}",
"status": 200
}
]
},
"resolvedrequest": {
"id": "tid",
"imp": [
{
"id": "impId001",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
]
},
"ext": {
"datablocks": {
"host": "localhost:8090",
"sourceId": 1
}
}
},
{
"id": "impId002",
"video": {
"mimes": [
"video/mp4"
],
"w": 300,
"h": 250,
"skipmin": 0,
"skipafter": 0,
"pos": 1
},
"ext": {
"datablocks": {
"host": "localhost:8090",
"sourceId": 2
}
}
}
],
"site": {
"domain": "example.com",
"page": "http://www.example.com",
"publisher": {
"id": "publisherId"
},
"ext": {
"amp": 0
}
},
"device": {
"ua": "userAgent",
"dnt": 2,
"ip": "193.168.244.1",
"pxratio": 4.2,
"language": "en",
"ifa": "ifaId"
},
"user": {
"ext": {
"consent": "consentValue",
"digitrust": {
"id": "id",
"keyv": 123,
"pref": 0
}
}
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
"USD"
],
"source": {
"fd": 1,
"tid": "tid"
},
"regs": {
"ext": {
"gdpr": 0
}
},
"ext": {
"prebid": {
"targeting": {
"pricegranularity": {
"precision": 2,
"ranges": [
{
"max": 20,
"increment": 0.1
}
]
},
"currency": {
"rates": {
"EUR": {
"USD": 1.2406
},
"USD": {
"EUR": 0.811
}
}
},
"includewinners": true,
"includebidderkeys": true
},
"cache": {
"bids": {},
"vastxml": {
"ttlseconds": 120
}
}
}
}
}
},
"responsetimemillis": {
"datablocks": "{{ datablocks.response_time_ms }}",
"cache": "{{ cache.response_time_ms }}"
Original file line number Diff line number Diff line change
@@ -24,9 +24,6 @@
"page": "http://www.example.com",
"publisher": {
"id": "publisherId"
},
"ext": {
"amp": 0
}
},
"device": {
@@ -38,17 +35,8 @@
"ifa": "ifaId"
},
"user": {
"buyeruid": "DB-UID",
"ext": {
"consent": "consentValue",
"digitrust": {
"id": "id",
"keyv": 123,
"pref": 0
}
}
"buyeruid": "DB-UID"
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
Original file line number Diff line number Diff line change
@@ -26,9 +26,6 @@
"page": "http://www.example.com",
"publisher": {
"id": "publisherId"
},
"ext": {
"amp": 0
}
},
"device": {
@@ -40,17 +37,8 @@
"ifa": "ifaId"
},
"user": {
"buyeruid": "DB-UID",
"ext": {
"consent": "consentValue",
"digitrust": {
"id": "id",
"keyv": 123,
"pref": 0
}
}
"buyeruid": "DB-UID"
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
Original file line number Diff line number Diff line change
@@ -30,7 +30,6 @@
"id": "publisherId"
}
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
Original file line number Diff line number Diff line change
@@ -49,128 +49,6 @@
],
"cur": "USD",
"ext": {
"debug": {
"httpcalls": {
"cache": [
{
"uri": "{{ cache.endpoint }}",
"requestbody": "{\"puts\":[{\"type\":\"json\",\"value\":{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adm\":\"some-test-ad\",\"adid\":\"29681110\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"w\":1024,\"h\":576}}]}",
"responsebody": "{\"responses\":[{\"uuid\":\"78f9a6dd-d08c-4b80-ba0f-0159b9add9bf\"}]}",
"status": 200
}
],
"kubient": [
{
"uri": "{{ kubient.exchange_uri }}",
"requestbody": "{\"id\":\"tid\",\"imp\":[{\"id\":\"test-imp-banner-id\",\"banner\":{\"format\":[{\"w\":300,\"h\":250}],\"w\":500,\"h\":400},\"ext\":{\"bidder\":{}}}],\"site\":{\"domain\":\"example.com\",\"page\":\"http://www.example.com\",\"publisher\":{\"id\":\"publisherId\"},\"ext\":{\"amp\":0}},\"device\":{\"ua\":\"userAgent\",\"dnt\":2,\"ip\":\"193.168.244.1\",\"pxratio\":4.2,\"language\":\"en\",\"ifa\":\"ifaId\"},\"user\":{\"ext\":{\"consent\":\"consentValue\",\"digitrust\":{\"id\":\"id\",\"keyv\":123,\"pref\":0}}},\"test\":1,\"at\":1,\"tmax\":1000,\"cur\":[\"USD\"],\"source\":{\"fd\":1,\"tid\":\"tid\"},\"regs\":{\"ext\":{\"gdpr\":0}},\"ext\":{\"prebid\":{\"aliases\":{\"appnexusAlias\":\"appnexus\",\"conversantAlias\":\"conversant\"},\"targeting\":{\"pricegranularity\":{\"precision\":2,\"ranges\":[{\"max\":20,\"increment\":0.1}]},\"currency\":{\"rates\":{\"EUR\":{\"USD\":1.2406},\"USD\":{\"EUR\":0.811}}},\"includewinners\":true,\"includebidderkeys\":true},\"cache\":{\"bids\":{},\"vastxml\":{\"ttlseconds\":120}}}}}",
"responsebody": "{\"id\":\"tid\",\"seatbid\":[{\"bid\":[{\"id\":\"7706636740145184841\",\"impid\":\"test-imp-banner-id\",\"price\":0.5,\"adid\":\"29681110\",\"adm\":\"some-test-ad\",\"adomain\":[\"advertsite.com\"],\"cid\":\"772\",\"crid\":\"29681110\",\"h\":576,\"w\":1024}]}]}",
"status": 200
}
]
},
"resolvedrequest": {
"id": "tid",
"imp": [
{
"id": "test-imp-banner-id",
"banner": {
"format": [
{
"w": 300,
"h": 250
}
],
"w": 500,
"h": 400
},
"ext": {
"kubient": {
}
}
}
],
"site": {
"domain": "example.com",
"page": "http://www.example.com",
"publisher": {
"id": "publisherId"
},
"ext": {
"amp": 0
}
},
"device": {
"ua": "userAgent",
"dnt": 2,
"ip": "193.168.244.1",
"pxratio": 4.2,
"language": "en",
"ifa": "ifaId"
},
"user": {
"ext": {
"digitrust": {
"id": "id",
"keyv": 123,
"pref": 0
},
"consent": "consentValue"
}
},
"test": 1,
"at": 1,
"tmax": 1000,
"cur": [
"USD"
],
"source": {
"fd": 1,
"tid": "tid"
},
"regs": {
"ext": {
"gdpr": 0
}
},
"ext": {
"prebid": {
"aliases": {
"appnexusAlias": "appnexus",
"conversantAlias": "conversant"
},
"targeting": {
"pricegranularity": {
"precision": 2,
"ranges": [
{
"max": 20,
"increment": 0.1
}
]
},
"currency": {
"rates": {
"EUR": {
"USD": 1.2406
},
"USD": {
"EUR": 0.811
}
}
},
"includewinners": true,
"includebidderkeys": true
},
"cache": {
"bids": {},
"vastxml": {
"ttlseconds": 120
}
}
}
}
}
},
"responsetimemillis": {
"cache": "{{ cache.response_time_ms }}",
"kubient": "{{ kubient.response_time_ms }}"
Original file line number Diff line number Diff line change
@@ -14,8 +14,7 @@
"h": 400
},
"ext": {
"bidder": {
}
"bidder": {}
}
}
],
@@ -24,9 +23,6 @@
"page": "http://www.example.com",
"publisher": {
"id": "publisherId"
},
"ext": {
"amp": 0
}
},
"device": {
@@ -37,17 +33,7 @@
"language": "en",
"ifa": "ifaId"
},
"user": {
"ext": {
"digitrust": {
"id": "id",
"keyv": 123,
"pref": 0
},
"consent": "consentValue"
}
},
"test": 1,
"user": {},
"at": 1,
"tmax": 1000,
"cur": [
@@ -99,4 +85,4 @@
}
}
}
}
}
Loading