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

Greenbids: Populate AppliedTo and change structure of analytics results in Analytics Tag #3728

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
+60 −66
Open

Greenbids: Populate AppliedTo and change structure of analytics results in Analytics Tag #3728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e8c671a
Greenbids: Populate AppliedTo in Analytics Tag
EvgeniiMunin Feb 5, 2025
3e356bf
refactor
EvgeniiMunin Feb 5, 2025
1e23162
fix review
EvgeniiMunin Feb 6, 2025
9d6642a
fix review
EvgeniiMunin Feb 7, 2025
da98965
fix review
EvgeniiMunin Feb 7, 2025
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
17 changes: 2 additions & 15 deletions ...prebid/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,10 @@ public GreenbidsInvocationResult createGreenbidsInvocationResult(
final InvocationAction invocationAction = isExploration
? InvocationAction.no_action
: InvocationAction.update;
final Map<String, Map<String, Boolean>> impsBiddersFilterMapToAnalyticsTag = isExploration
? keepAllBiddersForAnalyticsResult(impsBiddersFilterMap)
: impsBiddersFilterMap;
final Map<String, Ortb2ImpExtResult> ort2ImpExtResultMap = createOrtb2ImpExtForImps(
bidRequest, impsBiddersFilterMapToAnalyticsTag, greenbidsId, isExploration);
bidRequest, impsBiddersFilterMap, greenbidsId, isExploration);
final AnalyticsResult analyticsResult = AnalyticsResult.of(
"success", ort2ImpExtResultMap, null, null);
"success", ort2ImpExtResultMap);

return GreenbidsInvocationResult.of(updatedBidRequest, invocationAction, analyticsResult);
}
Expand Down Expand Up @@ -83,16 +80,6 @@ private ObjectNode updateImpExt(ObjectNode impExt, Map<String, Boolean> bidderFi
return updatedExt;
}

private Map<String, Map<String, Boolean>> keepAllBiddersForAnalyticsResult(
Map<String, Map<String, Boolean>> impsBiddersFilterMap) {

return impsBiddersFilterMap.entrySet().stream()
.collect(Collectors.toMap(
Map.Entry::getKey,
entry -> entry.getValue().entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> true))));
}

private Map<String, Ortb2ImpExtResult> createOrtb2ImpExtForImps(
BidRequest bidRequest,
Map<String, Map<String, Boolean>> impsBiddersFilterMap,
Expand Down
4 changes: 0 additions & 4 deletions ...rg/prebid/server/hooks/modules/greenbids/real/time/data/model/result/AnalyticsResult.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,4 @@ public class AnalyticsResult {
String status;

Map<String, Ortb2ImpExtResult> values;

String bidder;

String impId;
}
45 changes: 28 additions & 17 deletions ...modules/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHook.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
import com.iab.openrtb.request.BidRequest;
import io.vertx.core.Future;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.BooleanUtils;
import org.prebid.server.analytics.reporter.greenbids.model.ExplorationResult;
import org.prebid.server.analytics.reporter.greenbids.model.Ortb2ImpExtResult;
import org.prebid.server.auction.model.AuctionContext;
import org.prebid.server.exception.PreBidException;
Expand Down Expand Up @@ -38,6 +40,7 @@
import org.prebid.server.settings.model.Account;
import org.prebid.server.settings.model.AccountHooksConfiguration;

import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -155,29 +158,25 @@ private InvocationResult<AuctionRequestPayload> toInvocationResult(
AnalyticsResult analyticsResult,
InvocationAction action) {

final List<AnalyticsResult> analyticsResults = analyticsResult != null
? Collections.singletonList(analyticsResult)
: Collections.emptyList();

return switch (action) {
case InvocationAction.update -> InvocationResultImpl
.<AuctionRequestPayload>builder()
.status(InvocationStatus.success)
.action(action)
.payloadUpdate(payload -> AuctionRequestPayloadImpl.of(bidRequest))
.analyticsTags(toAnalyticsTags(analyticsResults))
.analyticsTags(toAnalyticsTags(analyticsResult))
.build();
default -> InvocationResultImpl
.<AuctionRequestPayload>builder()
.status(InvocationStatus.success)
.action(action)
.analyticsTags(toAnalyticsTags(analyticsResults))
.analyticsTags(toAnalyticsTags(analyticsResult))
.build();
};
}

private Tags toAnalyticsTags(List<AnalyticsResult> analyticsResults) {
if (CollectionUtils.isEmpty(analyticsResults)) {
private Tags toAnalyticsTags(AnalyticsResult analyticsResults) {
if (analyticsResults == null) {
return null;
}

Expand All @@ -187,23 +186,35 @@ private Tags toAnalyticsTags(List<AnalyticsResult> analyticsResults) {
toResults(analyticsResults))));
}

private List<Result> toResults(List<AnalyticsResult> analyticsResults) {
return analyticsResults.stream()
.map(this::toResult)
private List<Result> toResults(AnalyticsResult analyticsResult) {
return analyticsResult.getValues().entrySet().stream()
.map(entry -> toResult(analyticsResult.getStatus(), entry))
.toList();
}

private Result toResult(AnalyticsResult analyticsResult) {
private Result toResult(String status, Map.Entry<String, Ortb2ImpExtResult> entry) {
final String impId = entry.getKey();
final Ortb2ImpExtResult ortb2ImpExtResult = entry.getValue();
final List<String> removedBidders = Optional.ofNullable(ortb2ImpExtResult)
.map(Ortb2ImpExtResult::getGreenbids)
.map(ExplorationResult::getKeptInAuction)
.map(Map::entrySet)
.stream()
.flatMap(Collection::stream)
.filter(e -> BooleanUtils.isFalse(e.getValue()))
.map(Map.Entry::getKey)
.toList();

return ResultImpl.of(
analyticsResult.getStatus(),
toObjectNode(analyticsResult.getValues()),
status,
toObjectNode(entry),
AppliedToImpl.builder()
.bidders(Collections.singletonList(analyticsResult.getBidder()))
.impIds(Collections.singletonList(analyticsResult.getImpId()))
.impIds(Collections.singletonList(impId))
.bidders(removedBidders.isEmpty() ? null: removedBidders)
.build());
}

private ObjectNode toObjectNode(Map<String, Ortb2ImpExtResult> values) {
private ObjectNode toObjectNode(Map.Entry<String, Ortb2ImpExtResult> values) {
return values != null ? mapper.valueToTree(values) : null;
}

Expand Down
4 changes: 2 additions & 2 deletions ...id/server/hooks/modules/greenbids/real/time/data/core/GreenbidsInvocationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,8 @@ public void createGreenbidsInvocationResultShouldReturnNoActionWhenExploration()
assertThat(ortb2ImpExtResult.getGreenbids().getIsExploration()).isTrue();
assertThat(ortb2ImpExtResult.getGreenbids().getFingerprint()).isNotNull();
assertThat(keptInAuction.get("rubicon")).isTrue();
assertThat(keptInAuction.get("appnexus")).isTrue();
assertThat(keptInAuction.get("pubmatic")).isTrue();
assertThat(keptInAuction.get("appnexus")).isFalse();
assertThat(keptInAuction.get("pubmatic")).isFalse();
}

private Map<String, Map<String, Boolean>> givenImpsBiddersFilterMap() {
Expand Down
14 changes: 5 additions & 9 deletions ...les/greenbids/real/time/data/v1/GreenbidsRealTimeDataProcessedAuctionRequestHookTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@
import org.prebid.server.hooks.v1.auction.AuctionInvocationContext;
import org.prebid.server.hooks.v1.auction.AuctionRequestPayload;
import org.prebid.server.model.HttpRequestContext;
import org.prebid.server.settings.model.Account;
import org.prebid.server.settings.model.AccountHooksConfiguration;

import java.io.IOException;
import java.net.InetAddress;
Expand Down Expand Up @@ -216,7 +214,7 @@ public void callShouldFilterBiddersWhenPartnerActivatedInBidRequest()
}

@Test
public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() throws OrtException, IOException {
public void callShouldFilterBiddersAndReturnAnalyticsTagWhenExploration() throws OrtException, IOException {
// given
final Banner banner = givenBanner();

Expand All @@ -238,7 +236,7 @@ public void callShouldNotFilterBiddersAndReturnAnalyticsTagWhenExploration() thr
when(thresholdsCacheWithExpiration.getIfPresent("throttlingThresholds_test-pbuid"))
.thenReturn(givenThrottlingThresholds());

final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(true, true);
final AnalyticsResult expectedAnalyticsResult = expectedAnalyticsResult(true, false);

// when
final Future<InvocationResult<AuctionRequestPayload>> future = target
Expand Down Expand Up @@ -471,9 +469,7 @@ private BidRequest expectedUpdatedBidRequest(
private AnalyticsResult expectedAnalyticsResult(Boolean isExploration, Boolean isKeptInAuction) {
return AnalyticsResult.of(
"success",
Map.of("adunitcodevalue", expectedOrtb2ImpExtResult(isExploration, isKeptInAuction)),
null,
null);
Map.of("adunitcodevalue", expectedOrtb2ImpExtResult(isExploration, isKeptInAuction)));
}

private Ortb2ImpExtResult expectedOrtb2ImpExtResult(Boolean isExploration, Boolean isKeptInAuction) {
Expand Down Expand Up @@ -507,8 +503,8 @@ private Result toResult(AnalyticsResult analyticsResult) {
analyticsResult.getStatus(),
toObjectNode(analyticsResult.getValues()),
AppliedToImpl.builder()
.bidders(Collections.singletonList(analyticsResult.getBidder()))
.impIds(Collections.singletonList(analyticsResult.getImpId()))
.impIds(Collections.singletonList("adunitcodevalue"))
.bidders(List.of("appnexus", "pubmatic", "rubicon"))
.build());
}

Expand Down
33 changes: 15 additions & 18 deletions src/main/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,14 @@
import org.prebid.server.settings.model.Account;
import org.prebid.server.settings.model.AccountAnalyticsConfig;
import org.prebid.server.util.HttpUtil;
import org.prebid.server.util.StreamUtil;
import org.prebid.server.version.PrebidVersionProvider;
import org.prebid.server.vertx.httpclient.HttpClient;
import org.prebid.server.vertx.httpclient.model.HttpClientResponse;

import java.time.Clock;
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Objects;
Expand Down Expand Up @@ -229,8 +228,7 @@ private Map<String, Ortb2ImpExtResult> extractAnalyticsResultFromAnalyticsTag(Au
.flatMap(Collection::stream)
.filter(activity -> "greenbids-filter".equals(activity.name()))
.map(Activity::results)
.map(List::getFirst)
.map(Result::values)
.flatMap(Collection::stream)
.map(this::parseAnalyticsResult)
.flatMap(map -> map.entrySet().stream())
.collect(Collectors.toMap(
Expand All @@ -239,21 +237,20 @@ private Map<String, Ortb2ImpExtResult> extractAnalyticsResultFromAnalyticsTag(Au
(existing, replacement) -> existing));
}

private Map<String, Ortb2ImpExtResult> parseAnalyticsResult(ObjectNode analyticsResult) {
private Map<String, Ortb2ImpExtResult> parseAnalyticsResult(Result result) {
return Optional.ofNullable(result)
.map(Result::values)
.stream()
.flatMap(valuesNode -> StreamUtil.asStream(valuesNode.fields()))
.collect(Collectors.toMap(
Map.Entry::getKey,
entry -> parseOrtb2ImpExtResult(entry.getValue()),
(existing, replacement) -> existing));
}

private Ortb2ImpExtResult parseOrtb2ImpExtResult(JsonNode node) {
try {
final Map<String, Ortb2ImpExtResult> parsedAnalyticsResult = new HashMap<>();
final Iterator<Map.Entry<String, JsonNode>> fields = analyticsResult.fields();

while (fields.hasNext()) {
final Map.Entry<String, JsonNode> field = fields.next();
final String impId = field.getKey();
final JsonNode explorationResultNode = field.getValue();
final Ortb2ImpExtResult ortb2ImpExtResult = jacksonMapper.mapper()
.treeToValue(explorationResultNode, Ortb2ImpExtResult.class);
parsedAnalyticsResult.put(impId, ortb2ImpExtResult);
}

return parsedAnalyticsResult;
return jacksonMapper.mapper().treeToValue(node, Ortb2ImpExtResult.class);
} catch (JsonProcessingException e) {
throw new PreBidException("Analytics result parsing error", e);
}
Expand Down
9 changes: 8 additions & 1 deletion ...t/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,10 @@
import org.prebid.server.hooks.execution.model.Stage;
import org.prebid.server.hooks.execution.model.StageExecutionOutcome;
import org.prebid.server.hooks.execution.v1.analytics.ActivityImpl;
import org.prebid.server.hooks.execution.v1.analytics.AppliedToImpl;
import org.prebid.server.hooks.execution.v1.analytics.ResultImpl;
import org.prebid.server.hooks.execution.v1.analytics.TagsImpl;
import org.prebid.server.hooks.v1.analytics.AppliedTo;
import org.prebid.server.json.EncodeException;
import org.prebid.server.json.JacksonMapper;
import org.prebid.server.model.HttpRequestContext;
Expand Down Expand Up @@ -733,11 +735,16 @@ private static HookExecutionContext givenHookExecutionContextWithAnalyticsTag()
"adunitcodevalue",
createAnalyticsResultNode()));

final AppliedTo appliedTo = AppliedToImpl.builder()
.impIds(Collections.singletonList("adunitcodevalue"))
.bidders(Collections.singletonList("seat1"))
.build();

final ActivityImpl activity = ActivityImpl.of(
"greenbids-filter",
"success",
Collections.singletonList(
ResultImpl.of("success", analyticsResultNode, null)));
ResultImpl.of("success", analyticsResultNode, appliedTo)));

final TagsImpl tags = TagsImpl.of(Collections.singletonList(activity));

Expand Down
Loading