Skip to content

Commit 44d93de

Browse files
authored
Merge branch 'master' into master
2 parents 0164a55 + f358e24 commit 44d93de

File tree

395 files changed

+17959
-552
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

395 files changed

+17959
-552
lines changed

README.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,14 @@ An option for developing Prebid Server in a reproducible environment isolated fr
9292

9393
Prebid Server is not currently intended to be imported by other projects. Go Modules is used to manage dependencies, which also makes it possible to import Prebid Server packages. This is not supported. We offer no guarantees regarding the stability of packages and do not adhere to semantic versioning guidelines.
9494

95+
## Swapping Global Dependencies
96+
97+
Logger is a global side-effectful dependency that sometimes needs to be swapped to modify the behavior.
98+
The `Logger` package contains an interface definition for unstructured logging with built-in `glog` implementation.
99+
The interface provides standard logging methods: `Debug`, `Info`, `Warn`, `Error`, and `Fatal`.
100+
The `glog` implementation is based on `github.com/golang/glog` package and serves as the concrete implementation for the logging interface.
101+
By default, the package uses the `glog` logger implementation.
102+
95103
## Contributing
96104
> [!IMPORTANT]
97105
> All contributions must follow the [Prebid Code of Conduct](https://prebid.org/code-of-conduct/) and the [Prebid Module Rules](https://docs.prebid.org/dev-docs/module-rules.html).

adapters/adagio/adagio.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ package adagio
22

33
import (
44
"encoding/json"
5-
"errors"
65
"fmt"
76
"net/http"
87

@@ -64,7 +63,7 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
6463
}
6564

6665
if len(bidResponse.SeatBid) == 0 {
67-
return nil, []error{errors.New("empty seatbid array")}
66+
return nil, []error{&errortypes.BadServerResponse{Message: "empty seatbid array"}}
6867
}
6968

7069
var errs []error
@@ -102,7 +101,6 @@ func (a *adapter) MakeBids(internalRequest *openrtb2.BidRequest, externalRequest
102101
Bid: &bid,
103102
BidMeta: meta,
104103
BidVideo: video,
105-
Seat: openrtb_ext.BidderName(seatBid.Seat),
106104
BidType: bidType,
107105
}
108106
bidderResponse.Bids = append(bidderResponse.Bids, typedBid)

adapters/adagio/adagiotest/exemplary/banner-app.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,6 @@
181181
"h": 50,
182182
"mtype": 1
183183
},
184-
"seat": "adagio",
185184
"type": "banner"
186185
}
187186
]

adapters/adagio/adagiotest/exemplary/banner-web.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
"h": 50,
149149
"mtype": 1
150150
},
151-
"seat": "adagio",
152151
"type": "banner"
153152
}
154153
]

adapters/adagio/adagiotest/exemplary/multi-formats-app.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,6 @@
207207
"h": 50,
208208
"mtype": 1
209209
},
210-
"seat": "adagio",
211210
"type": "banner"
212211
}
213212
]

adapters/adagio/adagiotest/exemplary/multi-formats-web.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@
174174
"h": 50,
175175
"mtype": 1
176176
},
177-
"seat": "adagio",
178177
"type": "banner"
179178
}
180179
]

adapters/adagio/adagiotest/exemplary/multi-imps-app.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,6 @@
225225
"h": 50,
226226
"mtype": 1
227227
},
228-
"seat": "adagio",
229228
"type": "banner"
230229
},
231230
{
@@ -242,7 +241,6 @@
242241
"h": 100,
243242
"mtype": 1
244243
},
245-
"seat": "adagio",
246244
"type": "banner"
247245
}
248246
]

adapters/adagio/adagiotest/exemplary/multi-imps-web.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,6 @@
194194
"h": 50,
195195
"mtype": 1
196196
},
197-
"seat": "adagio",
198197
"type": "banner"
199198
},
200199
{
@@ -211,7 +210,6 @@
211210
"h": 100,
212211
"mtype": 1
213212
},
214-
"seat": "adagio",
215213
"type": "banner"
216214
}
217215
]

adapters/adagio/adagiotest/exemplary/native-app.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
],
153153
"mtype": 4
154154
},
155-
"seat": "adagio",
156155
"type": "native"
157156
}
158157
]

adapters/adagio/adagiotest/exemplary/native-web.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
"h": 50,
149149
"mtype": 4
150150
},
151-
"seat": "adagio",
152151
"type": "native"
153152
}
154153
]

0 commit comments

Comments
 (0)