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.

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

Backport DNS Lookup adapter to version 2.5 #5274

Merged
merged 4 commits into from Nov 22, 2018

Conversation

Projects
None yet
3 participants
@danotorrey
Contributor

danotorrey commented Nov 6, 2018

Backport DNS Lookup adapter to version 2.5.

Add/update dependencies to allow backport:

  • Add Netty 4.1.31.FINAL dependency
  • Upgrade Google Guava from 23 to 23.6.1-jre

See 5d75547 for original commit in master.

Backport DNS Lookup adapter to version 2.5
Add/update dependencies to allow backport:
- Add Netty 4.1.31.FINAL dependency
- Upgrade Google Guava from 23 to 23.6.1-jre
@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 6, 2018

I am investigating the CI failures.

I am also planning to review this with Bernd next week.

@bernd bernd self-assigned this Nov 8, 2018

danotorrey added some commits Nov 8, 2018

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 9, 2018

I also added a missing netty-buffer dependency, which was causing a build failure. Let's see if the build passes this time.

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 9, 2018

@bernd CI build is not passing. This is ready for review.

@mpfz0r

This comment has been minimized.

Contributor

mpfz0r commented Nov 12, 2018

If you update Netty in 2.5 make sure to include
#5279

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 12, 2018

Thank you @mpfz0r! I definitely will include that change in 2.5. Removing Ready For Review flag until I merge in this change.

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 13, 2018

The netty-tcnative-boringssl-static.version dependency was added in the original Netty 4 upgrade in early 2018 (see 6762727). Though, I am not sure specifically what the dependency is for. It is not included in 2.5. I think we're OK without it.

@bernd Do you know anything about netty-tcnative-boringssl-static.version? Are we ok without it here? I think so.

@bernd

This comment has been minimized.

Member

bernd commented Nov 13, 2018

@danotorrey If we don't have the tcnative dependency in the 2.5 pom.xml, we don't need it. I think that one has been added to 3.0 to improve TLS performance for our message inputs.

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 13, 2018

@bernd Should I wait until the Gelfclient is released and update the version in this same PR? Seems like that might be ok, since the netty4 version is being added here too.

@bernd

This comment has been minimized.

Member

bernd commented Nov 14, 2018

@bernd Should I wait until the Gelfclient is released and update the version in this same PR? Seems like that might be ok, since the netty4 version is being added here too.

The new gelfclient version has been release and should be available. So yes, feel free to just do it in this PR. 👍

@danotorrey

This comment has been minimized.

Contributor

danotorrey commented Nov 16, 2018

@bernd gelfclient has been updated. Ready for review.

@danotorrey danotorrey self-assigned this Nov 20, 2018

@bernd

bernd approved these changes Nov 22, 2018

LGTM 👍

@bernd bernd added this to the 2.5.0 milestone Nov 22, 2018

@bernd bernd assigned bernd and unassigned danotorrey Nov 22, 2018

@bernd bernd merged commit 8978634 into 2.5 Nov 22, 2018

2 of 3 checks passed

ci-web-linter Jenkins build graylog-pr-linter-check 2958 has failed
Details
graylog-project/pr Jenkins build graylog-project-pr-snapshot 2198 has succeeded
Details
license/cla Contributor License Agreement is signed.
Details

@bernd bernd deleted the dns-lookup-adaptor-backport-2.5 branch Nov 22, 2018

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