analytics report remove bid req config

Author: EvgeniiMunin

src/main/java/org/prebid/server/analytics/reporter/greenbids/GreenbidsAnalyticsReporter.java

@@ -76,7 +76,6 @@
 
 public class GreenbidsAnalyticsReporter implements AnalyticsReporter {
 
-    private static final String BID_REQUEST_ANALYTICS_EXTENSION_NAME = "greenbids";
     private static final int RANGE_16_BIT_INTEGER_DIVISION_BASIS = 0x10000;
     private static final String ANALYTICS_REQUEST_ORIGIN_HEADER = "X-Request-Origin";
     private static final String PREBID_SERVER_HEADER_VALUE = "Prebid Server";
@@ -120,9 +119,7 @@ public <T> Future<Void> processEvent(T event) {
             return Future.failedFuture(new PreBidException("Bid response or auction context cannot be null"));
         }
 
-        final GreenbidsPrebidExt greenbidsBidRequestExt = Optional.ofNullable(
-                parseBidRequestExt(auctionContext.getBidRequest()))
-                .orElse(parseAccountConfig(auctionContext));
+        final GreenbidsPrebidExt greenbidsBidRequestExt = parseAccountConfig(auctionContext);
 
         if (greenbidsBidRequestExt == null) {
             return Future.succeededFuture();
@@ -165,6 +162,12 @@ public <T> Future<Void> processEvent(T event) {
                 .map(Device::getUa)
                 .ifPresent(userAgent -> headers.add(HttpUtil.USER_AGENT_HEADER, userAgent));
 
+        System.out.println(
+                "GreenbidsAnalyticsReporter/ processEvent \n" +
+                        "   commonMessageJson: " + commonMessageJson + "\n" +
+                        "   headers: " + headers
+        );
+
         final Future<HttpClientResponse> responseFuture = httpClient.post(
                 greenbidsAnalyticsProperties.getAnalyticsServerUrl(),
                 headers,
@@ -174,17 +177,6 @@ public <T> Future<Void> processEvent(T event) {
         return responseFuture.compose(this::processAnalyticServerResponse);
     }
 
-    private GreenbidsPrebidExt parseBidRequestExt(BidRequest bidRequest) {
-        return Optional.ofNullable(bidRequest)
-                .map(BidRequest::getExt)
-                .map(ExtRequest::getPrebid)
-                .map(ExtRequestPrebid::getAnalytics)
-                .filter(this::isNotEmptyObjectNode)
-                .map(analytics -> (ObjectNode) analytics.get(BID_REQUEST_ANALYTICS_EXTENSION_NAME))
-                .map(this::toGreenbidsPrebidExt)
-                .orElse(null);
-    }
-
     private GreenbidsPrebidExt parseAccountConfig(AuctionContext auctionContext) {
         final Map<String, ObjectNode> modules = Optional.ofNullable(auctionContext)
                 .map(AuctionContext::getAccount)
@@ -196,6 +188,12 @@ private GreenbidsPrebidExt parseAccountConfig(AuctionContext auctionContext) {
         if (modules != null && modules.containsKey("greenbids")) {
             final ObjectNode moduleConfig = modules.get("greenbids");
             greenbidsPrebidExt = toGreenbidsPrebidExt(moduleConfig);
+
+            System.out.println(
+                    "GreenbidsAnalyticsReporter/ parseAccountConfig \n" +
+                            "   moduleConfig: " + moduleConfig + "\n" +
+                            "   greenbidsPrebidExt: " + greenbidsPrebidExt
+            );
         }
 
         return greenbidsPrebidExt;

src/main/java/org/prebid/server/analytics/reporter/greenbids/model/GreenbidsPrebidExt.java

@@ -6,6 +6,8 @@
 @Value(staticConstructor = "of")
 public class GreenbidsPrebidExt {
 
+    Boolean enabled;
+
     String pbuid;
 
     @JsonProperty("greenbidsSampling")