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

New Adapter: Zentotem #3866

Closed
wants to merge 89 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
89 commits
Select commit Hold shift + click to select a range
9aef1ae
zentotem: add adapter
GermanBogatov Jul 2, 2024
6fdcc11
zentotem: add adapter
GermanBogatov Jul 10, 2024
3edd765
zentotem: add adapter
GermanBogatov Jul 11, 2024
9ec095a
zentotem: add adapter
GermanBogatov Jul 12, 2024
a7d9462
zentotem: add adapter
GermanBogatov Jul 30, 2024
36a4b0f
zentotem: add adapter
GermanBogatov Jul 30, 2024
9c6b5e3
zentotem: add adapter
GermanBogatov Aug 1, 2024
b3caeaa
Merge branch 'prebid:master' into master
zentotem Aug 16, 2024
e4bd6d3
ADTS-455 remove video validations (#3842)
gg-natalia Aug 18, 2024
153ebf5
zentotem: add adapter
GermanBogatov Aug 20, 2024
f075a67
Merge remote-tracking branch 'origin/master'
GermanBogatov Aug 20, 2024
6f3f47c
zentotem: add adapter
GermanBogatov Aug 20, 2024
6be7244
Update Vidazoo bidder info for GPP support (#3869)
saar120 Aug 21, 2024
e8509e6
declare support for ORTB 2.6 (#3872)
bretg Aug 21, 2024
d161712
new adapter (#3833)
Pubrise Aug 21, 2024
a556e2d
Fix currency conversion bug. (#3867)
CTMBNara Aug 21, 2024
59a5b07
freewheel-adapter: support 2.6 (#3873)
mwang-sticky Aug 21, 2024
54f8759
Update mobilefuse.yaml to indicate support for OpenRTB 2.6 and GPP (#…
dtbarne Aug 21, 2024
bd85ba4
specifies ortb 2.6 support (#3) (#3876)
nickllerandi Aug 22, 2024
84a8162
PulsePoint: ortb 2.6 version and gpp support (#3874)
anand-venkatraman Aug 22, 2024
536f118
zentotem: fix after review
GermanBogatov Aug 22, 2024
b5cb591
zentotem: fix after review
GermanBogatov Aug 22, 2024
8d7117d
Revert "New Module: 51Degrees (#3650)" (#3888)
bsardo Aug 27, 2024
4ea0e33
New Adapter: Copper6SSP (#3755)
Copper6SSP Aug 30, 2024
2e2b49f
New Adapter: Escalax (#3798)
escalax Aug 30, 2024
e825553
New Adapter: Oraki (#3839)
BenOraki Aug 30, 2024
f7caea5
OpenX: indicate support for OpenRTB 2.6 (#3879)
bwschmidt Aug 30, 2024
8237f7f
Refactor Bid Splitter Privacy Functions (#3645)
SyntaxNode Sep 3, 2024
ec6a45d
Agma: Allow app.bundle to be used as selector for apps (#3780)
steffenmllr Sep 4, 2024
6a011ed
Update github.com/rs/cors to v1.11.0 (#3884)
ccorbo Sep 11, 2024
b920cca
Playdigo: Add tcfeu support (#3890)
Yanivplaydigo Sep 11, 2024
e0a21d0
QT: Add tcfeu support (#3892)
qt-io Sep 11, 2024
6cbedf0
Smartx: Declare OpenRTB 2.6 support (#3896)
schubert-sc Sep 11, 2024
7613ff5
Update adapter json test framework to validate BidVideo (#3835)
laurb9 Sep 12, 2024
c02ee8c
Update exchange json tests with correct hb_pb_cat_dur (#3836)
laurb9 Sep 12, 2024
ffdd75f
New Adapter: AdTonos (#3853)
rkaw92 Sep 12, 2024
3e24be7
New Adapter: TGM (#3848)
apykhteyev Sep 13, 2024
640b97c
LemmaDigital: change endpoint (#3862)
lm-ved Sep 16, 2024
3c4527e
Adnuntius: Return DSA in bid response (#3777)
mikael-lundin Sep 18, 2024
905b3a5
Log non bid reasons in bidder framework (#2891)
ShriprasadM Sep 19, 2024
93368cc
ConnectAd: String/int fix (#3925)
rtuschkany Sep 19, 2024
11b6546
Rubicon: Pass PBS host info to XAPI (#3903)
And1sS Sep 23, 2024
4462fce
51degrees module (#3893)
justadreamer Sep 25, 2024
8b1b96e
Add docs build readme (#3930)
bsardo Sep 25, 2024
c42fe53
InMobi: mtype support (#3921)
bkaneyama Sep 25, 2024
53f51a6
GPC: Set extension based on header (#3895)
przemkaczmarek Sep 25, 2024
6c154e0
New Adapter: Streamlyn (#3900)
apykhteyev Sep 25, 2024
f27bcef
New Adapter: Bidmatic (#3731)
dkornet-ad Oct 3, 2024
8689e0d
Sonobi: native and currency conversion support (#3889)
bansawbanchee Oct 7, 2024
d54c3ed
New Adapter: Missena (#3761)
ysfbsf Oct 8, 2024
64584f6
Refactor: Remove getAuctionBidderRequests (#3957)
bsardo Oct 8, 2024
87d4412
Refactor: Move privacy init up (#3958)
bsardo Oct 9, 2024
9bb9b3d
Unruly: Indicate Support for OpenRTB 2.6 (#3984)
bhainesnexxen Oct 15, 2024
c37951a
update yieldmo.yaml to indicate support for ortb 2.6 (#3968)
ym-winston Oct 15, 2024
5fcbbbf
Triplelift: Adding flag for 2.6 support (#3966)
patrickloughrey Oct 15, 2024
cbe9876
enable gzip (#3946)
ikagotso Oct 15, 2024
b56923c
RTB House: Resolve AUCTION_PRICE macro (#3901)
piotrj-rtbh Oct 15, 2024
8134328
Displayio: Make imp.bidfloor optional (#3959)
xdevel Oct 16, 2024
451bc44
BlueSea: Add site capability (#3910)
blueseasx Oct 16, 2024
bcf6491
GumGum: Declare ORTB 2.6 support (#3985)
sindhuja-sridharan Oct 17, 2024
18f6798
Bump Go version to 1.22 in dev containers config (#3983)
sebhtml Oct 22, 2024
03a4abd
Sample: Fix prebid js loading bug on sample html page (#3792)
And1sS Oct 22, 2024
a23380f
ImproveDigital: Remove placementKey & addtlconsent parsing (#3728)
ishihanvcs Oct 29, 2024
ddf897c
Update Cookie Sync Chooser Debug Message to match Java (#3558)
AlexBVolcy Oct 29, 2024
1419761
Rename Blacklisted Apps to Blocked Apps (#3620)
SyntaxNode Oct 29, 2024
db2a872
ORTB 2.6: Full support with down convert for 2.5 adapters (#4019)
bsardo Oct 29, 2024
df58baf
Cookie Sync: Use max when limit is 0 (#4022)
bsardo Oct 30, 2024
3907f1a
Remove Default Request Hardcoded Aliases (#4020)
SyntaxNode Oct 30, 2024
5b11f59
Adapters: Update to use jsonutil unmarshal (#4021)
bsardo Oct 30, 2024
6e150f3
Increment Package Version To v3 (#4029)
SyntaxNode Oct 31, 2024
a788661
GumGum: Override the default currency (#3928)
MartinGumGum Nov 4, 2024
3403544
PgamSSP: Add currency converter (#3907)
PGAMSSP Nov 4, 2024
106f6e4
IQzone: Add user sync (#3971)
IQZoneAdx Nov 4, 2024
181d523
Fix: Delete user.ext.prebid.buyeruids after extraction (#4049)
bsardo Nov 13, 2024
24ba83b
Krushmedia: Update user sync urls (#3979)
Krushmedia Nov 13, 2024
63af8af
New Adapter: Nativo (#3790)
rafataveira Nov 13, 2024
573c59e
zentotem: add adapter
GermanBogatov Jul 2, 2024
f8ee4ed
zentotem: add adapter
GermanBogatov Jul 10, 2024
4bee7d9
zentotem: add adapter
GermanBogatov Jul 11, 2024
5cb43d2
zentotem: add adapter
GermanBogatov Jul 12, 2024
b6bc533
zentotem: add adapter
GermanBogatov Jul 30, 2024
39567ab
zentotem: add adapter
GermanBogatov Jul 30, 2024
93e3969
zentotem: add adapter
GermanBogatov Aug 1, 2024
bd22820
zentotem: add adapter
GermanBogatov Aug 20, 2024
2b0b9b1
zentotem: add adapter
GermanBogatov Aug 20, 2024
7a2144a
zentotem: fix after review
GermanBogatov Aug 22, 2024
d4290d3
zentotem: fix after review
GermanBogatov Aug 22, 2024
764f48a
zentotem: replace v2 to v3
GermanBogatov Nov 13, 2024
dc73050
Merge remote-tracking branch 'origin/master'
GermanBogatov Nov 13, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
"dockerfile": "Dockerfile",
"args": {
// Update the VARIANT arg to pick a version of Go
"VARIANT": "1.20",
"VARIANT": "1.22",
// Options
"INSTALL_NODE": "false",
"NODE_VERSION": "lts/*"
Expand Down
14 changes: 10 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,20 @@ WORKDIR /app/prebid-server/
ENV GOROOT=/usr/local/go
ENV PATH=$GOROOT/bin:$PATH
ENV GOPROXY="https://proxy.golang.org"

# Installing gcc as cgo uses it to build native code of some modules
RUN apt-get update && \
apt-get install -y git && \
apt-get install -y git gcc && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
ENV CGO_ENABLED 0

# CGO must be enabled because some modules depend on native C code
ENV CGO_ENABLED 1
COPY ./ ./
RUN go mod tidy
RUN go mod vendor
ARG TEST="true"
RUN if [ "$TEST" != "false" ]; then ./validate.sh ; fi
RUN go build -mod=vendor -ldflags "-X github.com/prebid/prebid-server/v2/version.Ver=`git describe --tags | sed 's/^v//'` -X github.com/prebid/prebid-server/v2/version.Rev=`git rev-parse HEAD`" .
RUN go build -mod=vendor -ldflags "-X github.com/prebid/prebid-server/v3/version.Ver=`git describe --tags | sed 's/^v//'` -X github.com/prebid/prebid-server/v3/version.Rev=`git rev-parse HEAD`" .

FROM ubuntu:20.04 AS release
LABEL maintainer="[email protected]"
Expand All @@ -30,8 +34,10 @@ RUN chmod a+xr prebid-server
COPY static static/
COPY stored_requests/data stored_requests/data
RUN chmod -R a+r static/ stored_requests/data

# Installing libatomic1 as it is a runtime dependency for some modules
RUN apt-get update && \
apt-get install -y ca-certificates mtr && \
apt-get install -y ca-certificates mtr libatomic1 && \
apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
RUN adduser prebid_user
USER prebid_user
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ test: deps
ifeq "$(adapter)" ""
./validate.sh
else
go test github.com/prebid/prebid-server/v2/adapters/$(adapter) -bench=.
go test github.com/prebid/prebid-server/v3/adapters/$(adapter) -bench=.
endif

# build-modules generates modules/builder.go file which provides a list of all available modules
Expand Down
5 changes: 5 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ or compile a standalone binary using the command:
``` bash
go build .
```
**Note:** if building from source there are a couple dependencies to be aware of:
1. *Compile-time*. Some modules ship native code that requires `cgo` (comes with the `go` compiler) being enabled - by default it is and environment variable `CGO_ENABLED=1` do NOT set it to `0`.
2. *Compile-time*. `cgo` depends on the C-compiler, which usually is `gcc`, but can be changed by setting the value of `CC` env var, f.e. `CC=clang`. On ubuntu `gcc` can be installed via `sudo apt-get install gcc`.
3. *Runtime*. Some modules require `libatomic`. On ubuntu it is installed by running `sudo apt-get install libatomic1`. `libatomic1` is a dependency of `gcc`, so if you are building with `gcc` and running on the same machine, it is likely that `libatomic1` is already installed.

Ensure that you deploy the `/static` directory, as Prebid Server requires those files at startup.

## Developing
Expand Down
14 changes: 7 additions & 7 deletions account/account.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (

"github.com/prebid/go-gdpr/consentconstants"

"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/metrics"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v2/stored_requests"
"github.com/prebid/prebid-server/v2/util/iputil"
"github.com/prebid/prebid-server/v2/util/jsonutil"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/metrics"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/stored_requests"
"github.com/prebid/prebid-server/v3/util/iputil"
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

// GetAccount looks up the config.Account object referenced by the given accountID, with access rules applied
Expand Down
14 changes: 7 additions & 7 deletions account/account_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,13 @@ import (
"fmt"
"testing"

"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/metrics"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v2/stored_requests"
"github.com/prebid/prebid-server/v2/util/iputil"
"github.com/prebid/prebid-server/v2/util/ptrutil"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/metrics"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/stored_requests"
"github.com/prebid/prebid-server/v3/util/iputil"
"github.com/prebid/prebid-server/v3/util/ptrutil"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/mock"
)
Expand Down
21 changes: 11 additions & 10 deletions adapters/33across/33across.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (

"github.com/prebid/openrtb/v20/adcom1"
"github.com/prebid/openrtb/v20/openrtb2"
"github.com/prebid/prebid-server/v2/adapters"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

type TtxAdapter struct {
Expand Down Expand Up @@ -76,7 +77,7 @@ func (a *TtxAdapter) MakeRequests(request *openrtb2.BidRequest, reqInfo *adapter
// Skip over imps whose extensions cannot be read since
// we cannot glean Prod or ZoneID which are required to
// group together. However let's not block request creation.
if err := json.Unmarshal(impCopy.Ext, &impExt); err == nil {
if err := jsonutil.Unmarshal(impCopy.Ext, &impExt); err == nil {
impKey := impExt.Ttx.Prod + impExt.Ttx.Zoneid
groupedImps[impKey] = append(groupedImps[impKey], impCopy)
} else {
Expand Down Expand Up @@ -126,14 +127,14 @@ func makeImps(imp openrtb2.Imp) (openrtb2.Imp, error) {
}

var bidderExt adapters.ExtImpBidder
if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
if err := jsonutil.Unmarshal(imp.Ext, &bidderExt); err != nil {
return openrtb2.Imp{}, &errortypes.BadInput{
Message: err.Error(),
}
}

var ttxExt openrtb_ext.ExtImp33across
if err := json.Unmarshal(bidderExt.Bidder, &ttxExt); err != nil {
if err := jsonutil.Unmarshal(bidderExt.Bidder, &ttxExt); err != nil {
return openrtb2.Imp{}, &errortypes.BadInput{
Message: err.Error(),
}
Expand Down Expand Up @@ -177,7 +178,7 @@ func makeReqExt(request *openrtb2.BidRequest) ([]byte, error) {
var reqExt reqExt

if len(request.Ext) > 0 {
if err := json.Unmarshal(request.Ext, &reqExt); err != nil {
if err := jsonutil.Unmarshal(request.Ext, &reqExt); err != nil {
return nil, err
}
}
Expand Down Expand Up @@ -215,7 +216,7 @@ func (a *TtxAdapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequ

var bidResp openrtb2.BidResponse

if err := json.Unmarshal(response.Body, &bidResp); err != nil {
if err := jsonutil.Unmarshal(response.Body, &bidResp); err != nil {
return nil, []error{err}
}

Expand All @@ -226,7 +227,7 @@ func (a *TtxAdapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequ
var bidExt bidExt
var bidType openrtb_ext.BidType

if err := json.Unmarshal(sb.Bid[i].Ext, &bidExt); err != nil {
if err := jsonutil.Unmarshal(sb.Bid[i].Ext, &bidExt); err != nil {
bidType = openrtb_ext.BidTypeBanner
} else {
bidType = getBidType(bidExt)
Expand Down
6 changes: 3 additions & 3 deletions adapters/33across/33across_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package ttx
import (
"testing"

"github.com/prebid/prebid-server/v2/adapters/adapterstest"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

func TestJsonSamples(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/33across/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

// This file actually intends to test static/bidder-params/33across.json
Expand Down
13 changes: 7 additions & 6 deletions adapters/aax/aax.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ import (
"net/url"

"github.com/prebid/openrtb/v20/openrtb2"
"github.com/prebid/prebid-server/v2/adapters"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

type adapter struct {
Expand Down Expand Up @@ -63,7 +64,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest

var bidResp openrtb2.BidResponse

if err := json.Unmarshal(response.Body, &bidResp); err != nil {
if err := jsonutil.Unmarshal(response.Body, &bidResp); err != nil {
return nil, []error{err}
}

Expand Down Expand Up @@ -96,7 +97,7 @@ func Builder(bidderName openrtb_ext.BidderName, config config.Adapter, server co

func getMediaTypeForImp(bid openrtb2.Bid, imps []openrtb2.Imp) (openrtb_ext.BidType, error) {
var bidExt aaxResponseBidExt
err := json.Unmarshal(bid.Ext, &bidExt)
err := jsonutil.Unmarshal(bid.Ext, &bidExt)
if err == nil {
switch bidExt.AdCodeType {
case "banner":
Expand Down
6 changes: 3 additions & 3 deletions adapters/aax/aax_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (

"github.com/stretchr/testify/assert"

"github.com/prebid/prebid-server/v2/adapters/adapterstest"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

func TestJsonSamples(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion adapters/aax/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

// This file actually intends to test static/bidder-params/aax.json
Expand Down
17 changes: 9 additions & 8 deletions adapters/aceex/aceex.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (
"text/template"

"github.com/prebid/openrtb/v20/openrtb2"
"github.com/prebid/prebid-server/v2/adapters"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/macros"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/macros"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

type adapter struct {
Expand Down Expand Up @@ -90,13 +91,13 @@ func (a *adapter) MakeRequests(

func (a *adapter) getImpressionExt(imp *openrtb2.Imp) (*openrtb_ext.ExtAceex, error) {
var bidderExt adapters.ExtImpBidder
if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
if err := jsonutil.Unmarshal(imp.Ext, &bidderExt); err != nil {
return nil, &errortypes.BadInput{
Message: "ext.bidder not provided",
}
}
var aceexExt openrtb_ext.ExtAceex
if err := json.Unmarshal(bidderExt.Bidder, &aceexExt); err != nil {
if err := jsonutil.Unmarshal(bidderExt.Bidder, &aceexExt); err != nil {
return nil, &errortypes.BadInput{
Message: "ext.bidder not provided",
}
Expand Down Expand Up @@ -151,7 +152,7 @@ func (a *adapter) MakeBids(

responseBody := bidderRawResponse.Body
var bidResp openrtb2.BidResponse
if err := json.Unmarshal(responseBody, &bidResp); err != nil {
if err := jsonutil.Unmarshal(responseBody, &bidResp); err != nil {
return nil, []error{&errortypes.BadServerResponse{
Message: "Bad Server Response",
}}
Expand Down
6 changes: 3 additions & 3 deletions adapters/aceex/aceex_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package aceex
import (
"testing"

"github.com/prebid/prebid-server/v2/adapters/adapterstest"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion adapters/aceex/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

var validParams = []string{
Expand Down
17 changes: 9 additions & 8 deletions adapters/acuityads/acuityads.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,12 @@ import (
"text/template"

"github.com/prebid/openrtb/v20/openrtb2"
"github.com/prebid/prebid-server/v2/adapters"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/errortypes"
"github.com/prebid/prebid-server/v2/macros"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/errortypes"
"github.com/prebid/prebid-server/v3/macros"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/prebid/prebid-server/v3/util/jsonutil"
)

type AcuityAdsAdapter struct {
Expand Down Expand Up @@ -90,13 +91,13 @@ func (a *AcuityAdsAdapter) MakeRequests(

func (a *AcuityAdsAdapter) getImpressionExt(imp *openrtb2.Imp) (*openrtb_ext.ExtAcuityAds, error) {
var bidderExt adapters.ExtImpBidder
if err := json.Unmarshal(imp.Ext, &bidderExt); err != nil {
if err := jsonutil.Unmarshal(imp.Ext, &bidderExt); err != nil {
return nil, &errortypes.BadInput{
Message: "ext.bidder not provided",
}
}
var acuityAdsExt openrtb_ext.ExtAcuityAds
if err := json.Unmarshal(bidderExt.Bidder, &acuityAdsExt); err != nil {
if err := jsonutil.Unmarshal(bidderExt.Bidder, &acuityAdsExt); err != nil {
return nil, &errortypes.BadInput{
Message: "ext.bidder not provided",
}
Expand Down Expand Up @@ -155,7 +156,7 @@ func (a *AcuityAdsAdapter) MakeBids(

responseBody := bidderRawResponse.Body
var bidResp openrtb2.BidResponse
if err := json.Unmarshal(responseBody, &bidResp); err != nil {
if err := jsonutil.Unmarshal(responseBody, &bidResp); err != nil {
return nil, []error{&errortypes.BadServerResponse{
Message: "Bad Server Response",
}}
Expand Down
6 changes: 3 additions & 3 deletions adapters/acuityads/acuityads_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package acuityads
import (
"testing"

"github.com/prebid/prebid-server/v2/adapters/adapterstest"
"github.com/prebid/prebid-server/v2/config"
"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/adapters/adapterstest"
"github.com/prebid/prebid-server/v3/config"
"github.com/prebid/prebid-server/v3/openrtb_ext"
"github.com/stretchr/testify/assert"
)

Expand Down
2 changes: 1 addition & 1 deletion adapters/acuityads/params_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"encoding/json"
"testing"

"github.com/prebid/prebid-server/v2/openrtb_ext"
"github.com/prebid/prebid-server/v3/openrtb_ext"
)

var validParams = []string{
Expand Down
Loading
Loading