Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion docs/config-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ This parameter exists to allow to change the location of the directory Vert.x wi

## Server
- `server.max-headers-size` - set the maximum length of all headers.
- `server.max-body-size` - set the maximum length of body.
- `server.ssl` - enable SSL/TLS support.
- `server.jks-path` - path to the java keystore (if ssl is enabled).
- `server.jks-password` - password for the keystore (if ssl is enabled).
Expand Down Expand Up @@ -91,7 +92,6 @@ Removes and downloads file again if depending service cant process probably corr
- `auction.biddertmax.max` - maximum operation timeout for OpenRTB Auction requests.
- `auction.biddertmax.percent` - adjustment factor for `request.tmax` for bidders.
- `auction.tmax-upstream-response-time` - the amount of time that PBS needs to respond to the original caller.
- `auction.max-request-size` - set the maximum size in bytes of OpenRTB Auction request.
- `auction.stored-requests-timeout-ms` - timeout for stored requests fetching.
- `auction.ad-server-currency` - default currency for auction, if its value was not specified in request. Important note: PBS uses ISO-4217 codes for the representation of currencies.
- `auction.cache.expected-request-time-ms` - approximate value in milliseconds for Cache Service interacting.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ public void extractThrottlingMessagesFromBidRequestShouldReturnValidThrottlingMe
assertThat(throttlingMessages).isNotEmpty();
assertThat(throttlingMessages)
.extracting(ThrottlingMessage::getBidder)
.containsExactly("rubicon", "appnexus", "pubmatic");
.containsExactly("magnite", "appnexus", "pubmatic");

throttlingMessages.forEach(message -> {
assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue");
Expand Down Expand Up @@ -128,7 +128,7 @@ public void extractThrottlingMessagesFromBidRequestShouldReturnValidThrottlingMe
assertThat(throttlingMessages).isNotEmpty();
assertThat(throttlingMessages)
.extracting(ThrottlingMessage::getBidder)
.containsExactly("rubicon", "appnexus", "pubmatic");
.containsExactly("magnite", "appnexus", "pubmatic");

throttlingMessages.forEach(message -> {
assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue");
Expand Down Expand Up @@ -162,7 +162,7 @@ public void extractThrottlingMessagesFromBidRequestShouldHandleMissingIp() {
assertThat(throttlingMessages).isNotEmpty();
assertThat(throttlingMessages)
.extracting(ThrottlingMessage::getBidder)
.containsExactly("rubicon", "appnexus", "pubmatic");
.containsExactly("magnite", "appnexus", "pubmatic");

throttlingMessages.forEach(message -> {
assertThat(message.getAdUnitCode()).isEqualTo("adunitcodevalue");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public void createGreenbidsInvocationResultWhenNotExploration() {
assertThat(ortb2ImpExtResult).isNotNull();
assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isFalse();
assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull();
assertThat(keptInAuction.get("rubicon")).isTrue();
assertThat(keptInAuction.get("magnite")).isTrue();
assertThat(keptInAuction.get("appnexus")).isFalse();
assertThat(keptInAuction.get("pubmatic")).isFalse();
}
Expand Down Expand Up @@ -78,7 +78,7 @@ public void createShouldReturnNoActionWhenExploration() {
assertThat(ortb2ImpExtResult).isNotNull();
assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isTrue();
assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull();
assertThat(keptInAuction.get("rubicon")).isFalse();
assertThat(keptInAuction.get("magnite")).isFalse();
assertThat(keptInAuction.get("appnexus")).isFalse();
assertThat(keptInAuction.get("pubmatic")).isFalse();
}
Expand Down Expand Up @@ -107,14 +107,14 @@ public void createShouldReturnRejectWhenAllImpsAreFilteredOutAndNoExploration()
assertThat(ortb2ImpExtResult).isNotNull();
assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isFalse();
assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull();
assertThat(keptInAuction.get("rubicon")).isFalse();
assertThat(keptInAuction.get("magnite")).isFalse();
assertThat(keptInAuction.get("appnexus")).isFalse();
assertThat(keptInAuction.get("pubmatic")).isFalse();
}

private Map<String, Map<String, Boolean>> givenImpsBiddersFilterMap() {
final Map<String, Boolean> biddersFitlerMap = Map.of(
"rubicon", true,
"magnite", true,
"appnexus", false,
"pubmatic", false);

Expand All @@ -123,7 +123,7 @@ private Map<String, Map<String, Boolean>> givenImpsBiddersFilterMap() {

private Map<String, Map<String, Boolean>> givenFilterMapWithAllFilteredImps() {
final Map<String, Boolean> biddersFitlerMap = Map.of(
"rubicon", false,
"magnite", false,
"appnexus", false,
"pubmatic", false);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import static org.assertj.core.api.Assertions.assertThat;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getAppnexusNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getPubmaticNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getRubiconNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getMagniteNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBidRequest;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenImpExt;

Expand All @@ -22,18 +22,18 @@ public void updateShouldReturnUpdatedBidRequest() {
// given
final Imp givenImp = Imp.builder()
.id("adunitcodevalue")
.ext(givenImpExt(getRubiconNode(), getAppnexusNode(), getPubmaticNode()))
.ext(givenImpExt(getMagniteNode(), getAppnexusNode(), getPubmaticNode()))
.build();

// when
final BidRequest result = GreenbidsPayloadUpdater.update(
givenBidRequest(identity(), List.of(givenImp)),
Map.of("adunitcodevalue", Map.of("rubicon", true, "appnexus", false, "pubmatic", false)));
Map.of("adunitcodevalue", Map.of("magnite", true, "appnexus", false, "pubmatic", false)));

// then
final Imp expectedImp = Imp.builder()
.id("adunitcodevalue")
.ext(givenImpExt(getRubiconNode(), null, null))
.ext(givenImpExt(getMagniteNode(), null, null))
.build();

assertThat(result.getImp()).containsOnly(expectedImp);
Expand All @@ -44,13 +44,13 @@ public void updateShouldRemoveImpFromUpdateBidRequestWhenAllBiddersFiltered() {
// given
final Imp givenImp = Imp.builder()
.id("adunitcodevalue")
.ext(givenImpExt(getRubiconNode(), null, null))
.ext(givenImpExt(getMagniteNode(), null, null))
.build();

// when
final BidRequest result = GreenbidsPayloadUpdater.update(
givenBidRequest(identity(), List.of(givenImp)),
Map.of("adunitcodevalue", Map.of("rubicon", false, "appnexus", false, "pubmatic", false)));
Map.of("adunitcodevalue", Map.of("magnite", false, "appnexus", false, "pubmatic", false)));

// then
assertThat(result.getImp()).isEmpty();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public void setUp() throws OrtException, IOException {
public void runModelShouldReturnProbabilitiesWhenValidThrottlingInferenceRow() throws OrtException {
// given
final String[][] throttlingInferenceRow = {{
"Chrome 59", "rubicon", "adunitcodevalue", "US", "www.leparisien.fr", "PC", "10", "1"}};
"Chrome 59", "magnite", "adunitcodevalue", "US", "www.leparisien.fr", "PC", "10", "1"}};

// when
final OrtSession.Result actualResult = target.runModel(throttlingInferenceRow);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ public static Site givenSite() {
}

public static ObjectNode givenImpExt() {
return givenImpExt(getRubiconNode(), getAppnexusNode(), getPubmaticNode());
return givenImpExt(getMagniteNode(), getAppnexusNode(), getPubmaticNode());
}

public static ObjectNode givenImpExt(ObjectNode rubiconNode, ObjectNode appnexusNode, ObjectNode pubmaticNode) {
public static ObjectNode givenImpExt(ObjectNode magniteNode, ObjectNode appnexusNode, ObjectNode pubmaticNode) {
final ObjectNode bidderNode = MAPPER.createObjectNode();

if (rubiconNode != null) {
bidderNode.set("rubicon", rubiconNode);
if (magniteNode != null) {
bidderNode.set("magnite", magniteNode);
}

if (appnexusNode != null) {
Expand All @@ -70,7 +70,7 @@ public static ObjectNode getAppnexusNode() {
return MAPPER.createObjectNode().put("placementId", 123456);
}

public static ObjectNode getRubiconNode() {
public static ObjectNode getMagniteNode() {
return MAPPER.createObjectNode()
.put("accountId", 1001)
.put("siteId", 267318)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
import static org.mockito.Mockito.mock;
import static org.prebid.server.auction.model.BidRejectionReason.REQUEST_BLOCKED_OPTIMIZED;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.MAPPER;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getRubiconNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.getMagniteNode;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenBidRequest;
import static org.prebid.server.hooks.modules.greenbids.real.time.data.util.TestBidRequestProvider.givenImpExt;

Expand Down Expand Up @@ -84,7 +84,7 @@ public void callShouldReturnAnalyticTagsWithoutFilteringOutBiddersWhenExploratio
final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(explorationRate);

given(filterService.filterBidders(any(), any(), any())).willReturn(Map.of("adunitcodevalue",
Map.of("rubicon", false, "appnexus", false, "pubmatic", false)));
Map.of("magnite", false, "appnexus", false, "pubmatic", false)));

// when
final Future<InvocationResult<AuctionRequestPayload>> future = target
Expand All @@ -100,11 +100,11 @@ public void callShouldReturnAnalyticTagsWithoutFilteringOutBiddersWhenExploratio
final ResultImpl actualResult = (ResultImpl) actualActivity.results().getFirst();
final AppliedTo acctualAppliedTo = actualResult.appliedTo();

assertThat(acctualAppliedTo.bidders()).containsOnly("appnexus", "pubmatic", "rubicon");
assertThat(acctualAppliedTo.bidders()).containsOnly("appnexus", "pubmatic", "magnite");
assertThat(acctualAppliedTo.impIds()).containsOnly("adunitcodevalue");
assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("keptInAuction"))
.isEqualTo(MAPPER.createObjectNode()
.put("rubicon", false)
.put("magnite", false)
.put("appnexus", false)
.put("pubmatic", false));
assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("fingerprint").asText())
Expand All @@ -127,7 +127,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() {
final AuctionInvocationContext invocationContext = givenAuctionInvocationContext(explorationRate);

given(filterService.filterBidders(any(), any(), any())).willReturn(Map.of("adunitcodevalue",
Map.of("rubicon", true, "appnexus", false, "pubmatic", false)));
Map.of("magnite", true, "appnexus", false, "pubmatic", false)));

// when
final Future<InvocationResult<AuctionRequestPayload>> future = target
Expand All @@ -145,7 +145,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() {

final Imp expectedImp = Imp.builder()
.id("adunitcodevalue")
.ext(givenImpExt(getRubiconNode(), null, null))
.ext(givenImpExt(getMagniteNode(), null, null))
.build();
assertThat(resultBidRequest).isEqualTo(givenBidRequest(identity(), List.of(expectedImp)));

Expand All @@ -157,7 +157,7 @@ public void callShouldFilterBiddersBasedOnModelResultsWhenExplorationIsFalse() {
assertThat(acctualAppliedTo.impIds()).containsOnly("adunitcodevalue");
assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("keptInAuction"))
.isEqualTo(MAPPER.createObjectNode()
.put("rubicon", true)
.put("magnite", true)
.put("appnexus", false)
.put("pubmatic", false));
assertThat(actualResult.values().get("adunitcodevalue").get("greenbids").get("fingerprint").asText())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,6 @@
*/
public class AuctionRequestFactory {

private final long maxRequestSize;
private final Ortb2RequestFactory ortb2RequestFactory;
private final StoredRequestProcessor storedRequestProcessor;
private final ProfilesProcessor profilesProcessor;
Expand All @@ -58,8 +57,7 @@ public class AuctionRequestFactory {

private static final String ENDPOINT = Endpoint.openrtb2_auction.value();

public AuctionRequestFactory(long maxRequestSize,
Ortb2RequestFactory ortb2RequestFactory,
public AuctionRequestFactory(Ortb2RequestFactory ortb2RequestFactory,
StoredRequestProcessor storedRequestProcessor,
ProfilesProcessor profilesProcessor,
BidRequestOrtbVersionConversionManager ortbVersionConversionManager,
Expand All @@ -75,7 +73,6 @@ public AuctionRequestFactory(long maxRequestSize,
GeoLocationServiceWrapper geoLocationServiceWrapper,
BidAdjustmentsEnricher bidAdjustmentsEnricher) {

this.maxRequestSize = maxRequestSize;
this.ortb2RequestFactory = Objects.requireNonNull(ortb2RequestFactory);
this.storedRequestProcessor = Objects.requireNonNull(storedRequestProcessor);
this.profilesProcessor = Objects.requireNonNull(profilesProcessor);
Expand Down Expand Up @@ -167,10 +164,6 @@ private String extractAndValidateBody(RoutingContext routingContext) {
throw new InvalidRequestException("Incoming request has no body");
}

if (body.length() > maxRequestSize) {
throw new InvalidRequestException("Request size exceeded max size of %d bytes.".formatted(maxRequestSize));
}

return body;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ public class VideoRequestFactory {
private static final int DEFAULT_CACHE_LOG_TTL = 3600;
private static final String ENDPOINT = Endpoint.openrtb2_video.value();

private final int maxRequestSize;
private final boolean enforceStoredRequest;
private final Pattern escapeLogCacheRegexPattern;

Expand All @@ -64,8 +63,7 @@ public class VideoRequestFactory {
private final JacksonMapper mapper;
private final GeoLocationServiceWrapper geoLocationServiceWrapper;

public VideoRequestFactory(int maxRequestSize,
boolean enforceStoredRequest,
public VideoRequestFactory(boolean enforceStoredRequest,
String escapeLogCacheRegex,
Ortb2RequestFactory ortb2RequestFactory,
VideoStoredRequestProcessor storedRequestProcessor,
Expand All @@ -77,7 +75,6 @@ public VideoRequestFactory(int maxRequestSize,
GeoLocationServiceWrapper geoLocationServiceWrapper) {

this.enforceStoredRequest = enforceStoredRequest;
this.maxRequestSize = maxRequestSize;
this.ortb2RequestFactory = Objects.requireNonNull(ortb2RequestFactory);
this.storedRequestProcessor = Objects.requireNonNull(storedRequestProcessor);
this.ortbVersionConversionManager = Objects.requireNonNull(ortbVersionConversionManager);
Expand Down Expand Up @@ -178,10 +175,6 @@ private String extractAndValidateBody(RoutingContext routingContext) {
throw new InvalidRequestException("Incoming request has no body");
}

if (body.length() > maxRequestSize) {
throw new InvalidRequestException("Request size exceeded max size of %d bytes.".formatted(maxRequestSize));
}

return body;
}

Expand Down
Loading
Loading