Skip to content

NextMillennium: Adapter and server version #3814

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

Merged
CTMBNara merged 13 commits into from
May 16, 2025
Merged

NextMillennium: Adapter and server version #3814

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
333befd
NextMillennium: Adapter and server version
przemkaczmarek Mar 6, 2025
99a129e
fix server_version
przemkaczmarek Mar 6, 2025
34fad7e
fix comments
przemkaczmarek Mar 10, 2025
961a9c8
fix comments
przemkaczmarek Mar 11, 2025
40fdf2f
fix comments
przemkaczmarek Mar 11, 2025
9b6a05e
fix comments
przemkaczmarek Mar 14, 2025
249843e
fix comments
przemkaczmarek Mar 17, 2025
97ab21e
fix comments
przemkaczmarek Mar 19, 2025
8e6da2f
fix comments
przemkaczmarek Mar 19, 2025
fa02a9c
fix comments
przemkaczmarek Apr 1, 2025
95c2a5c
fix comments
przemkaczmarek Apr 17, 2025
4ac1dc4
fix comments
przemkaczmarek Apr 17, 2025
2225a20
Merge branch 'master' into NextMillennium-Adapter-and-server-version-…
przemkaczmarek May 6, 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
35 changes: 21 additions & 14 deletions src/main/java/org/prebid/server/bidder/nextmillennium/NextMillenniumBidder.java
View file
Open in desktop
Comment thread
CTMBNara marked this conversation as resolved.
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.prebid.server.proto.openrtb.ext.ExtPrebid;
import org.prebid.server.proto.openrtb.ext.request.ExtRequest;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebid;
import org.prebid.server.proto.openrtb.ext.request.ExtRequestPrebidServer;
import org.prebid.server.proto.openrtb.ext.request.ExtStoredRequest;
import org.prebid.server.proto.openrtb.ext.request.nextmillennium.ExtImpNextMillennium;
import org.prebid.server.proto.openrtb.ext.request.nextmillennium.ExtRequestNextMillennium;
Expand All @@ -40,7 +41,6 @@
import java.util.Collection;
import java.util.List;
import java.util.Objects;
import java.util.Optional;

public class NextMillenniumBidder implements Bidder<BidRequest> {

Expand Down Expand Up @@ -95,26 +95,33 @@ private ExtImpNextMillennium convertExt(ObjectNode impExt) {
private BidRequest updateBidRequest(BidRequest bidRequest, ExtImpNextMillennium ext) {
final ExtStoredRequest storedRequest = ExtStoredRequest.of(resolveStoredRequestId(bidRequest, ext));

final ExtRequest requestExt = bidRequest.getExt();
final ExtRequestPrebid existingPrebid = requestExt != null ? requestExt.getPrebid() : null;
final ExtRequestPrebidServer existingServer = existingPrebid != null ? existingPrebid.getServer() : null;

final ExtRequestPrebid createdExtRequestPrebid = ExtRequestPrebid.builder()
.storedrequest(storedRequest)
.server(existingServer)
.build();

final ExtRequestPrebid extRequestPrebid = Optional.ofNullable(bidRequest)
.map(BidRequest::getExt)
.map(ExtRequest::getPrebid)
.map(prebid -> prebid.toBuilder().storedrequest(storedRequest).build())
.orElse(createdExtRequestPrebid);

final ExtRequestPrebid updatedExt = extRequestPrebid.toBuilder()
.nextMillennium(ExtRequestNextMillennium.of(
nmmFlags,
NM_ADAPTER_VERSION,
versionProvider.getNameVersionRecord()))
final ExtRequest extRequest = ExtRequest.of(createdExtRequestPrebid);

final ObjectNode nextMillenniumNode = mapper.mapper().valueToTree(
ExtRequestNextMillennium.of(nmmFlags, NM_ADAPTER_VERSION, versionProvider.getNameVersionRecord()));

extRequest.addProperty("next_millennium", nextMillenniumNode);

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

incorrect property name, should be nextMillennium


final Imp firstImp = bidRequest.getImp().getFirst();
final ObjectNode updatedImpExt = mapper.mapper().createObjectNode();
updatedImpExt.set("bidder", mapper.mapper().valueToTree(ext));

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this? I don't see any bidder field in the bidder request

@przemkaczmarek przemkaczmarek Mar 10, 2025 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

in L11-15 there is bidder field:

"ext": {
        "bidder": {
          "placement_id": "placement_id"
        }
      }

@AntoxaAntoxic AntoxaAntoxic Mar 11, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the Go doesn't have it


final Imp updatedImp = firstImp.toBuilder()
.ext(updatedImpExt)
Comment thread
przemkaczmarek marked this conversation as resolved.
Outdated
.build();

return bidRequest.toBuilder()
.imp(bidRequest.getImp())
.ext(ExtRequest.of(updatedExt))
.imp(List.of(updatedImp))

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it should update only a first imp, but not replace the whole list of imps with a single one

.ext(extRequest)
.build();
Comment on lines +115 to +113

@AntoxaAntoxic AntoxaAntoxic Mar 7, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

imp[0].ext update is missing

}

Expand Down
6 changes: 0 additions & 6 deletions src/main/java/org/prebid/server/proto/openrtb/ext/request/ExtRequestPrebid.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
import org.prebid.server.auction.model.PaaFormat;
import org.prebid.server.floors.model.PriceFloorRules;
import org.prebid.server.json.deserializer.IntegerFlagDeserializer;
import org.prebid.server.proto.openrtb.ext.request.nextmillennium.ExtRequestNextMillennium;

import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -191,9 +190,4 @@ public class ExtRequestPrebid {
*/
@JsonProperty("paaformat")
PaaFormat paaFormat;

/**
* Defines the contract for bidrequest.ext.prebid.nextMillennium
*/
ExtRequestNextMillennium nextMillennium;
}
4 changes: 4 additions & 0 deletions .../org/prebid/server/proto/openrtb/ext/request/nextmillennium/ExtRequestNextMillennium.java
View file
Open in desktop
Comment thread
CTMBNara marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -1,15 +1,19 @@
package org.prebid.server.proto.openrtb.ext.request.nextmillennium;

import com.fasterxml.jackson.annotation.JsonProperty;
import lombok.Value;

import java.util.List;

@Value(staticConstructor = "of")
public class ExtRequestNextMillennium {

@JsonProperty("nmm_flags")
List<String> nmmFlags;
Comment thread
CTMBNara marked this conversation as resolved.
Outdated

@JsonProperty("nm_version")

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant

@przemkaczmarek przemkaczmarek Mar 10, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think its not redutat because i got from server:
image

and how about "still incorrect, it should be nmmFlags" i have got n m m F l a g s . where is a problem?

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the annotation is redundant

i have got n m m F l a g s . where is a problem? Sorry, I didn't get. According to the Go the field should be serialized into the nnmFlags instead of nnm_flags

@przemkaczmarek przemkaczmarek Mar 10, 2025

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nnm or nmm ? I have got nmm in Go and Java
image

@AntoxaAntoxic AntoxaAntoxic Mar 11, 2025 •
edited
Loading

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the point was about the case, it should be nmmFlags instead of the nmm_flags in the bidder request

String nmVersion;

@JsonProperty("server_version")

@AntoxaAntoxic AntoxaAntoxic Mar 10, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

redundant

String serverVersion;
}
11 changes: 5 additions & 6 deletions ...sources/org/prebid/server/it/openrtb2/nextmillennium/test-nextmillennium-bid-request.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
},
"secure": 1,
"ext": {
"tid": "${json-unit.any-string}",
"bidder": {
"placement_id": "placement_id"
}
Expand Down Expand Up @@ -53,12 +52,12 @@
"gvlid": 1,
"datacenter": "local",
"endpoint": "/openrtb2/auction"
},
"next_millennium": {
"nmm_flags": [ "1" ],
"nm_version": "v1.0.0",
"server_version": "${json-unit.any-string}"
}
},
"next_millennium": {
"nmm_flags": [ "1" ],
"nm_version": "v1.0.0",
"server_version": "${json-unit.any-string}"
}
}
}