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

[Sharethrough] Add new Sharethrough Adapter #903

Merged
merged 31 commits into from
Jun 5, 2019
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
561bbc9
Merge pull request #1 from prebid/master
maphe Mar 18, 2019
81781cf
wip
May 15, 2018
9e5f5cc
wip
May 16, 2018
90879cc
wip
May 18, 2018
1749761
exploration for sharethrough prebid-server
Oct 25, 2018
3118800
Merge remote-tracking branch 'sharethrough/cn/add_str_bidder' into cn…
Mar 25, 2019
67436b0
WIP: updating sharethrough adapter to latest prebid version
Mar 29, 2019
3b15444
WIP: adding butler params to the request
Apr 5, 2019
49002fb
Manage bid sizes
Apr 11, 2019
8d4fff0
Manage GDPR
Apr 12, 2019
e492203
Populate prebid-server version if provided
Apr 12, 2019
edc8d76
Refactor gdpr data extraction from request
Apr 12, 2019
c9301b4
Add instant play capability
Apr 12, 2019
1b20442
Split in multiple files
Apr 12, 2019
962666d
Merge pull request #2 from sharethrough/cn/add_str_bidder
maphe Apr 19, 2019
665ae99
Add s2s-win beacon
Apr 19, 2019
c6cefa5
Removing `server` param in s2s-win beacon (will be added in imp req)
Apr 23, 2019
311d1a4
Merge pull request #3 from sharethrough/mp-ep/add-s2s-win-beacon
Apr 25, 2019
6800634
Clean up code + enable syncer (#4)
May 3, 2019
93756ef
Proper error handling (#6)
May 10, 2019
33e75e4
Implement Unit Tests (#7)
May 14, 2019
44455a2
Send supplyId to imp req instead of hbSource (#5)
May 15, 2019
a17beca
Finalize PR (#8)
May 15, 2019
0b73d0e
Merge branch 'master' of https://github.com/prebid/prebid-server into…
May 15, 2019
0d58bb0
Remove test setting
May 15, 2019
60ecbde
Add Sharethrough in syncer_test
May 15, 2019
23686e3
Update deserializing of third party partners
May 17, 2019
6bbeade
Refactor/optimize UserAgent parsing (#9)
May 31, 2019
5aac9ec
Addressing June 3rd review from prebid/prebid-server#903
Jun 3, 2019
3caa28e
Addressing June 4th review from prebid/prebid-server#903 (#10)
Jun 4, 2019
55f03f0
Fix adMarkup error handling
Jun 4, 2019
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
Merge branch 'master' of https://github.com/prebid/prebid-server into…
… sharethrough_master

# Conflicts:
#	exchange/adapter_map.go
#	openrtb_ext/bidders.go
Mathieu Pheulpin committed May 15, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
commit 0b73d0e44f3dc9270866dd7b7f0a057278a34915
17 changes: 9 additions & 8 deletions exchange/adapter_map.go
Original file line number Diff line number Diff line change
@@ -61,14 +61,15 @@ func newAdapterMap(client *http.Client, cfg *config.Configuration, infos adapter
cfg.Adapters[string(openrtb_ext.BidderRubicon)].XAPI.Username,
cfg.Adapters[string(openrtb_ext.BidderRubicon)].XAPI.Password,
cfg.Adapters[string(openrtb_ext.BidderRubicon)].XAPI.Tracker),
openrtb_ext.BidderSharethrough: sharethrough.NewSharethroughBidder(cfg.Adapters[string(openrtb_ext.BidderSharethrough)].Endpoint),
openrtb_ext.BidderSomoaudience: somoaudience.NewSomoaudienceBidder(cfg.Adapters[string(openrtb_ext.BidderSomoaudience)].Endpoint),
openrtb_ext.BidderSovrn: sovrn.NewSovrnBidder(client, cfg.Adapters[string(openrtb_ext.BidderSovrn)].Endpoint),
openrtb_ext.Bidder33Across: ttx.New33AcrossBidder(cfg.Adapters[string(openrtb_ext.Bidder33Across)].Endpoint),
openrtb_ext.BidderGrid: grid.NewGridBidder(cfg.Adapters[string(openrtb_ext.BidderGrid)].Endpoint),
openrtb_ext.BidderSonobi: sonobi.NewSonobiBidder(client, cfg.Adapters[string(openrtb_ext.BidderSonobi)].Endpoint),
openrtb_ext.BidderYieldmo: yieldmo.NewYieldmoBidder(cfg.Adapters[string(openrtb_ext.BidderYieldmo)].Endpoint),
openrtb_ext.BidderGamoshi: gamoshi.NewGamoshiBidder(cfg.Adapters[string(openrtb_ext.BidderGamoshi)].Endpoint),
openrtb_ext.BidderSharethrough: sharethrough.NewSharethroughBidder(cfg.Adapters[string(openrtb_ext.BidderSharethrough)].Endpoint),
openrtb_ext.BidderSomoaudience: somoaudience.NewSomoaudienceBidder(cfg.Adapters[string(openrtb_ext.BidderSomoaudience)].Endpoint),
openrtb_ext.BidderSovrn: sovrn.NewSovrnBidder(client, cfg.Adapters[string(openrtb_ext.BidderSovrn)].Endpoint),
openrtb_ext.Bidder33Across: ttx.New33AcrossBidder(cfg.Adapters[string(openrtb_ext.Bidder33Across)].Endpoint),
openrtb_ext.BidderGrid: grid.NewGridBidder(cfg.Adapters[string(openrtb_ext.BidderGrid)].Endpoint),
openrtb_ext.BidderSonobi: sonobi.NewSonobiBidder(client, cfg.Adapters[string(openrtb_ext.BidderSonobi)].Endpoint),
openrtb_ext.BidderYieldmo: yieldmo.NewYieldmoBidder(cfg.Adapters[string(openrtb_ext.BidderYieldmo)].Endpoint),
openrtb_ext.BidderGamoshi: gamoshi.NewGamoshiBidder(cfg.Adapters[string(openrtb_ext.BidderGamoshi)].Endpoint),
openrtb_ext.BidderImprovedigital: improvedigital.NewImprovedigitalBidder(cfg.Adapters[string(openrtb_ext.BidderImprovedigital)].Endpoint),
}

legacyBidders := map[openrtb_ext.BidderName]adapters.Adapter{
53 changes: 27 additions & 26 deletions openrtb_ext/bidders.go
Original file line number Diff line number Diff line change
@@ -20,32 +20,33 @@ type BidderName string
// These names _must_ coincide with the bidder code in Prebid.js, if an adapter also exists in that project.
// Please keep these (and the BidderMap) alphabetized to minimize merge conflicts among adapter submissions.
const (
Bidder33Across BidderName = "33across"
BidderAdkernelAdn BidderName = "adkernelAdn"
BidderAdtelligent BidderName = "adtelligent"
BidderAdform BidderName = "adform"
BidderAppnexus BidderName = "appnexus"
BidderBeachfront BidderName = "beachfront"
BidderBrightroll BidderName = "brightroll"
BidderConsumable BidderName = "consumable"
BidderConversant BidderName = "conversant"
BidderEPlanning BidderName = "eplanning"
BidderFacebook BidderName = "audienceNetwork"
BidderGamoshi BidderName = "gamoshi"
BidderGrid BidderName = "grid"
BidderGumGum BidderName = "gumgum"
BidderIx BidderName = "ix"
BidderLifestreet BidderName = "lifestreet"
BidderOpenx BidderName = "openx"
BidderPubmatic BidderName = "pubmatic"
BidderPulsepoint BidderName = "pulsepoint"
BidderRhythmone BidderName = "rhythmone"
BidderRubicon BidderName = "rubicon"
BidderSharethrough BidderName = "sharethrough"
BidderSomoaudience BidderName = "somoaudience"
BidderSovrn BidderName = "sovrn"
BidderSonobi BidderName = "sonobi"
BidderYieldmo BidderName = "yieldmo"
Bidder33Across BidderName = "33across"
BidderAdkernelAdn BidderName = "adkernelAdn"
BidderAdtelligent BidderName = "adtelligent"
BidderAdform BidderName = "adform"
BidderAppnexus BidderName = "appnexus"
BidderBeachfront BidderName = "beachfront"
BidderBrightroll BidderName = "brightroll"
BidderConsumable BidderName = "consumable"
BidderConversant BidderName = "conversant"
BidderEPlanning BidderName = "eplanning"
BidderFacebook BidderName = "audienceNetwork"
BidderGamoshi BidderName = "gamoshi"
BidderGrid BidderName = "grid"
BidderGumGum BidderName = "gumgum"
BidderImprovedigital BidderName = "improvedigital"
BidderIx BidderName = "ix"
BidderLifestreet BidderName = "lifestreet"
BidderOpenx BidderName = "openx"
BidderPubmatic BidderName = "pubmatic"
BidderPulsepoint BidderName = "pulsepoint"
BidderRhythmone BidderName = "rhythmone"
BidderRubicon BidderName = "rubicon"
BidderSharethrough BidderName = "sharethrough"
BidderSomoaudience BidderName = "somoaudience"
BidderSovrn BidderName = "sovrn"
BidderSonobi BidderName = "sonobi"
BidderYieldmo BidderName = "yieldmo"
)

// BidderMap stores all the valid OpenRTB 2.x Bidders in the project. This map *must not* be mutated.
You are viewing a condensed version of this merge commit. You can view the full changes here.