align bridge to yaauie/elasticsearch@94d58d47cd#1
Merged
mashhurs merged 2 commits intomashhurs:move-to-es-bridge-investigationfrom Sep 3, 2025
Merged
Conversation
mashhurs
approved these changes
Sep 2, 2025
Owner
mashhurs
left a comment
mashhurs
left a comment
There was a problem hiding this comment.
LGTM - Really appreciate your review, especially, mitigating the risk of geoip version conflict case.
|
|
||
| workingDir esSource | ||
| commandLine "./gradlew", "localDistro" | ||
| commandLine "./gradlew", "--stacktrace", "localDistro" |
| import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.CHMCache; | ||
| import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.NoCache; | ||
| import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.NodeCache; | ||
| import org.elasticsearch.ingest.geoip.shaded.com.maxmind.db.Reader; |
Owner
There was a problem hiding this comment.
Ah, this was my confusion that we fully move to the ES logstash-bridge w/o embedding the JARs but after analyzing the risk of conflict, as we took offline discussion, our original approach is the right one.
This indicates we DON'T NEED maxmind dependencies in
libs/logstash-bridge/build.gradle->compileOnly('com.maxmind.db:maxmind-db:3.1.1')- and
libs/logstash-bridge/src/main/java/module-info.java->requires com.maxmind.db;
Owner
There was a problem hiding this comment.
I will remove these dependencies, just noting here to remind myself while reviewing.
| String processorTag, | ||
| String description, | ||
| Map<String, Object> config, | ||
| ProjectIdBridge projectIdBridge) throws Exception { |
Owner
There was a problem hiding this comment.
Yup sounds reasonable that we have separate constructors.
- `new ${BRIDGE}(...)` -> `${BRIDGE}.create(...)`: use bridge-provided
factory methods
- `${INTERNAL}Bridge.${NESTED}` -> `${INTERNAL}${NESTED}Bridge`: extract
nested bridges to top-level
- `${BRIDGE}.AbstractExternal` -> `AbstractExternal${BRIDGE}`: extract
nested "AbstractExternal" base implementations to top-level
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This aligns to my upstream changes in mashhurs/elasticsearch#2
It:
restores the relocation of previously-shaded dependencies, since Logstash plugins are also known to load joni, jackson, and maxmind libraries that are not necessarily the same version
uses entirely externalized/bridged types
removes an unused exception unwrapping function (that could never have worked)
Closes: Review move to bridge PRs. elastic/logstash-filter-elastic_integration#366