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.

Sign up for GitHub

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

Jump to bottom

Migrate PBS from using embedded Vert.x to verticles #2306

Merged
merged 17 commits into from
Apr 8, 2024
Merged

Migrate PBS from using embedded Vert.x to verticles #2306

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
06da74f
Started rewriting old usage of embedded vertx to verticles deployment…
And1sS Apr 20, 2023
6e053ef
Merge tag 'master' into verticles
And1sS Feb 27, 2024
0d0b767
Remove PG code.
CTMBNara Mar 1, 2024
c9a8730
Verticles: Make deployment synchronous (#2313)
And1sS Mar 4, 2024
1491993
Delete tests.
CTMBNara Mar 4, 2024
dab59d9
Simplified deployment
And1sS Mar 5, 2024
08bb2e1
Merge remote-tracking branch 'origin/remove-pg' into verticles
Mar 6, 2024
57c85ab
Simplified routing
And1sS Mar 6, 2024
64f8097
Merge remote-tracking branch 'origin/verticles' into verticles
And1sS Mar 6, 2024
0f88298
Merge remote-tracking branch 'origin/master' into remove-pg
CTMBNara Mar 6, 2024
a028f2b
Refactor `ContextRunner`. (#3037)
CTMBNara Mar 6, 2024
e319061
Merge remote-tracking branch 'origin/master' into remove-pg
CTMBNara Mar 7, 2024
bc949b7
Merge remote-tracking branch 'origin/remove-pg' into verticles
CTMBNara Mar 7, 2024
efb2493
Verticles: Refactoring. (#3047)
CTMBNara Mar 11, 2024
7ce8520
Remove `LocalMessageCodec`
CTMBNara Mar 13, 2024
8267043
Merge remote-tracking branch 'origin/remove-pg' into verticles
CTMBNara Mar 13, 2024
a227fdb
Merge branch 'master' into verticles
Net-burst Apr 8, 2024
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
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackAnalyticsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.Initializable;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.util.Arrays;
import java.util.Collections;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/analytics/reporter/pubstack/PubstackEventHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.prebid.server.exception.PreBidException;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/bidder/BidderErrorNotifier.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
import org.prebid.server.bidder.model.HttpRequest;
import org.prebid.server.log.ConditionalLogger;
import org.prebid.server.metric.Metrics;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.util.Objects;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/bidder/HttpBidderRequester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
import org.prebid.server.proto.openrtb.ext.response.ExtHttpCall;
import org.prebid.server.proto.openrtb.ext.response.FledgeAuctionConfig;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/cache/CacheService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
import org.prebid.server.util.HttpUtil;
import org.prebid.server.util.ObjectUtil;
import org.prebid.server.vast.VastModifier;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.net.MalformedURLException;
import java.net.URL;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/currency/CurrencyConversionService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.prebid.server.spring.config.model.ExternalConversionProperties;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.Initializable;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.io.IOException;
import java.math.BigDecimal;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/deals/AlertHttpService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import org.prebid.server.json.EncodeException;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.time.Clock;
import java.time.ZonedDateTime;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/deals/DeliveryStatsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
import org.prebid.server.metric.MetricName;
import org.prebid.server.metric.Metrics;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.io.ByteArrayOutputStream;
import java.io.IOException;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/deals/PlannerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import org.prebid.server.metric.MetricName;
import org.prebid.server.metric.Metrics;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.time.Clock;
import java.util.Base64;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/deals/RegisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.Initializable;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.math.BigDecimal;
import java.time.ZonedDateTime;
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/deals/UserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
import org.prebid.server.metric.MetricName;
import org.prebid.server.metric.Metrics;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.time.Clock;
import java.time.ZonedDateTime;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/deals/simulation/SimulationAwareDeliveryStatsService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import org.prebid.server.deals.proto.report.DeliveryProgressReport;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.metric.Metrics;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.httpclient.HttpClient;

import java.time.Clock;
import java.time.ZonedDateTime;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/deals/simulation/SimulationAwareHttpBidderRequester.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.prebid.server.proto.openrtb.ext.request.ExtDeal;
import org.prebid.server.proto.openrtb.ext.request.ExtDealLine;
import org.prebid.server.proto.openrtb.ext.response.BidType;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.httpclient.HttpClient;

import java.math.BigDecimal;
import java.util.Collection;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/deals/simulation/SimulationAwarePlannerService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
import org.prebid.server.deals.proto.LineItemMetaData;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.metric.Metrics;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.httpclient.HttpClient;

import java.time.Clock;
import java.time.ZonedDateTime;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/deals/simulation/SimulationAwareRegisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.prebid.server.deals.model.PlannerProperties;
import org.prebid.server.health.HealthMonitor;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.httpclient.HttpClient;

import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/org/prebid/server/deals/simulation/SimulationAwareUserService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import org.prebid.server.execution.Timeout;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.metric.Metrics;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.httpclient.HttpClient;

import java.time.Clock;

Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/prebid/server/floors/PriceFloorFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
import org.prebid.server.settings.model.AccountPriceFloorsFetchConfig;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.util.ObjectUtil;
import org.prebid.server.vertx.http.HttpClient;
import org.prebid.server.vertx.http.model.HttpClientResponse;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.util.Map;
import java.util.Objects;
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/org/prebid/server/handler/BidderParamHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,30 @@
package org.prebid.server.handler;

import io.vertx.core.Handler;
import io.vertx.core.http.HttpMethod;
import io.vertx.ext.web.RoutingContext;
import org.prebid.server.model.Endpoint;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.validation.BidderParamValidator;
import org.prebid.server.vertx.verticles.server.HttpEndpoint;
import org.prebid.server.vertx.verticles.server.application.ApplicationResource;

import java.util.Collections;
import java.util.List;
import java.util.Objects;

public class BidderParamHandler implements Handler<RoutingContext> {
public class BidderParamHandler implements ApplicationResource {

private final BidderParamValidator bidderParamValidator;

public BidderParamHandler(BidderParamValidator bidderParamValidator) {
this.bidderParamValidator = Objects.requireNonNull(bidderParamValidator);
}

@Override
public List<HttpEndpoint> endpoints() {
return Collections.singletonList(HttpEndpoint.of(HttpMethod.GET, "/bidders/params"));
And1sS marked this conversation as resolved.
Show resolved Hide resolved
}

@Override
public void handle(RoutingContext routingContext) {
HttpUtil.executeSafely(routingContext, Endpoint.bidder_params,
Expand Down
13 changes: 11 additions & 2 deletions src/main/java/org/prebid/server/handler/CookieSyncHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
import io.netty.handler.codec.http.HttpHeaderValues;
import io.netty.handler.codec.http.HttpResponseStatus;
import io.vertx.core.Future;
import io.vertx.core.Handler;
import io.vertx.core.buffer.Buffer;
import io.vertx.core.http.HttpMethod;
import io.vertx.core.logging.Logger;
import io.vertx.core.logging.LoggerFactory;
import io.vertx.ext.web.RoutingContext;
Expand Down Expand Up @@ -36,11 +36,15 @@
import org.prebid.server.settings.ApplicationSettings;
import org.prebid.server.settings.model.Account;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.verticles.server.HttpEndpoint;
import org.prebid.server.vertx.verticles.server.application.ApplicationResource;

import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Objects;

public class CookieSyncHandler implements Handler<RoutingContext> {
public class CookieSyncHandler implements ApplicationResource {

private static final Logger logger = LoggerFactory.getLogger(CookieSyncHandler.class);
private static final ConditionalLogger BAD_REQUEST_LOGGER = new ConditionalLogger(logger);
Expand Down Expand Up @@ -82,6 +86,11 @@ public CookieSyncHandler(long defaultTimeout,
this.mapper = Objects.requireNonNull(mapper);
}

@Override
public List<HttpEndpoint> endpoints() {
return Collections.singletonList(HttpEndpoint.of(HttpMethod.POST, "/cookie_sync"));
}

@Override
public void handle(RoutingContext routingContext) {
metrics.updateCookieSyncRequestMetric();
Expand Down
79 changes: 0 additions & 79 deletions src/main/java/org/prebid/server/handler/CustomizedAdminEndpoint.java
View file
Open in desktop

This file was deleted.

13 changes: 11 additions & 2 deletions src/main/java/org/prebid/server/handler/GetuidsHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.prebid.server.handler;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.vertx.core.Handler;
import io.vertx.core.http.HttpMethod;
import io.vertx.ext.web.RoutingContext;
import lombok.AllArgsConstructor;
import lombok.Value;
Expand All @@ -10,12 +10,16 @@
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.model.Endpoint;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.vertx.verticles.server.HttpEndpoint;
import org.prebid.server.vertx.verticles.server.application.ApplicationResource;

import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;

public class GetuidsHandler implements Handler<RoutingContext> {
public class GetuidsHandler implements ApplicationResource {

private final UidsCookieService uidsCookieService;
private final JacksonMapper mapper;
Expand All @@ -25,6 +29,11 @@ public GetuidsHandler(UidsCookieService uidsCookieService, JacksonMapper mapper)
this.mapper = Objects.requireNonNull(mapper);
}

@Override
public List<HttpEndpoint> endpoints() {
return Collections.singletonList(HttpEndpoint.of(HttpMethod.GET, "/getuids"));
}

@Override
public void handle(RoutingContext routingContext) {
final Map<String, String> uids = uidsFrom(routingContext);
Expand Down
Loading