[WIP] Adapt ongoing geoip upstream changes.

[mashhurs]

Pulls this elastic/elasticsearch#145011 PR changes and tests

[mergify]

This pull request does not have a backport label. Could you fix it @mashhurs? 🙏
To fixup this pull request, you need to add the backport labels for the needed
branches, such as:

• backport-8./d is the label to automatically backport to the 8./d branch. /d is the digit.
• If no backport is necessary, please add the backport-skip label

[yaauie]

There's some nuance with how we get the shaded dependencies lined up for this project, the new ingest-ip-location module, and the dependencies of the ip-location module (but maybe not the functionality from that module, since the ingest-ip-location provides an implementation of elasticsearch-ip-location-api for use with its database providers). But Logstash also provides those dependencies, although it may be a different version which is why we need the shading.

I'll need to validate it next week when my head has the room to think it through.

[yaauie]

Suggested change

	task shadeElasticsearchIpLocationModule(type: com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar) {

[mashhurs]

Yep, properly renamed them now as my first very minimal change was to check the tests.

[yaauie]

do we need everything, or can we get only the geoip dependencies?

[mashhurs]

Yeah, as per my analysis (correct me if I am wrong), we need all (ip-location, ip-location-api and ingest-ip-location) need to exist in the JARs but we have to only shade the ip-location since others are references by the logstash-bridge:

• IpLocationServiceAdapter from ingest-ip-location
• no-op IpLocationService from ip-location-api

[yaauie]

Suggested change

	from(shadeElasticsearchIngestGeoIpModule)
	from(shadeElasticsearchIpLocationModule)

[elasticmachine]

💛 Build succeeded, but was flaky

• Buildkite Build
• Commit: 68e9766

Failed CI Steps

• Unit test for 9.2.8-SNAPSHOT, snapshot: true

History

• 💚 Build #780 succeeded 68e9766
• 💚 Build #769 succeeded 155d5b0