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

Greenbids fix geolookup: host and fetch GCS + mock dbReader UT #3626

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Greenbids fix geolookup: host and fetch GCS + mock dbReader UT #3626

wants to merge 15 commits into from

Conversation

EvgeniiMunin
Copy link
Contributor

@EvgeniiMunin EvgeniiMunin commented Dec 13, 2024 •
edited
Loading

🔧 Type of changes

  • new bid adapter
  • bid adapter update
  • new feature
  • new analytics adapter
  • new module
  • module update
  • bugfix
  • documentation
  • configuration
  • dependency update
  • tech debt (test coverage, refactorings, etc.)

✨ What's the context?

🧠 Rationale behind the change

  • We host the GeoLite2-Country.mmdb in Greenbids GCS bucket instead of open source URL: gs://greenbids-europe-west1-prebid-server-staging/GeoLite2-Country.mmdb
  • We mock the dbReader in unit test instead of loading real mmdb
  • We add the logic to fallback to getCountry(ip) only in case if Device::getGeo is null (geoLookupEnabled is false in GeoLocationServiceWrapper)

🔎 New Bid Adapter Checklist

  • verify email contact works
  • NO fully dynamic hostnames
  • geographic host parameters are NOT required
  • direct use of HTTP is prohibited - implement an existing Bidder interface that will do all the job
  • if the ORTB is just forwarded to the endpoint, use the generic adapter - define the new adapter as the alias of the generic adapter
  • cover an adapter configuration with an integration test

🧪 Test plan

How do you know the changes are safe to ship to production?

🏎 Quality check

  • Are your changes following our code style guidelines?
  • Are there any breaking changes in your code?
  • Does your test coverage exceed 90%?
  • Are there any erroneous console logs, debuggers or leftover code in your changes?

@EvgeniiMunin EvgeniiMunin changed the title Greenbids fix geolookup: mock dbReader TU + host GCS Greenbids fix geolookup: host and fetch GCS + mock dbReader TU Dec 13, 2024
@EvgeniiMunin EvgeniiMunin changed the title Greenbids fix geolookup: host and fetch GCS + mock dbReader TU Greenbids fix geolookup: host and fetch GCS + mock dbReader UT Dec 13, 2024
@EvgeniiMunin EvgeniiMunin force-pushed the greenbids-fix-geolookup branch from e5faad5 to ee640d3 Compare December 13, 2024 18:56
@EvgeniiMunin EvgeniiMunin marked this pull request as ready for review December 13, 2024 18:59
AntoxaAntoxic
AntoxaAntoxic previously approved these changes Dec 16, 2024
View reviewed changes
@EvgeniiMunin
Copy link
Contributor Author

Groovy IT is failing

Error:  Tests run: 38, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 21.95 s <<< FAILURE! -- in org.prebid.server.functional.tests.module.responsecorrenction.ResponseCorrectionSpec
Error:  org.prebid.server.functional.tests.module.responsecorrenction.ResponseCorrectionSpec.PBS should modify meta.mediaType and type for original response and also emit logs when response contains native meta.mediaType and adm without asset -- Time elapsed: 0.286 s <<< FAILURE!

I will push an empty commit to see if it is a flaky one

@AntoxaAntoxic AntoxaAntoxic added the do not merge Not the time for merging yet label Dec 16, 2024
AntoxaAntoxic
AntoxaAntoxic reviewed Dec 18, 2024
View reviewed changes
...a/org/prebid/server/hooks/modules/greenbids/real/time/data/config/DatabaseReaderFactory.java Outdated
Comment on lines 54 to 61
private Path downloadFile(String url, String accountId, String licenseKey) throws IOException {
final URL downloadUrl = new URL(url + "&account_id=" + accountId + "&license_key=" + licenseKey);
final HttpURLConnection connection = (HttpURLConnection) downloadUrl.openConnection();
connection.setRequestMethod("GET");

final String auth = accountId + ":" + licenseKey;
final String encodedAuth = Base64.getEncoder().encodeToString(auth.getBytes());
connection.setRequestProperty("Authorization", "Basic " + encodedAuth);
Copy link
Collaborator

Choose a reason for hiding this comment

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

I suggest using vertx http client for file downloading

Also, it's a little bit weird that it's required to send credentials via the url and the authorization header simultaneously, I assume it should work both ways but separately, so I prefer using just URL approach and do not expose account id and license key as separate properties

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@CTMBNara CTMBNara Awaiting requested review from CTMBNara

@AntoxaAntoxic AntoxaAntoxic Awaiting requested review from AntoxaAntoxic

At least 1 approving review is required to merge this pull request.

Assignees

@osulzhenko osulzhenko

Labels
do not merge Not the time for merging yet do not port
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@EvgeniiMunin @AntoxaAntoxic @osulzhenko