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.

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

Include rewrite-tag-filter plugin for fluentd #155

Merged
merged 2 commits into from
Jul 3, 2018
Merged

Include rewrite-tag-filter plugin for fluentd #155

merged 2 commits into from
Jul 3, 2018

Conversation

naiduarvind
Copy link

Signed-off-by: naiduarvind [email protected]

@naiduarvind
Copy link
Author

I created a new clean PR that passes the checks. If you could review and let me know if there is anything else that needs to be fixed.

cc: @errm @repeatedly

@@ -12,6 +12,9 @@ gem "oj", "3.5.1"
<% if !is_v1 %>
gem "fluent-plugin-secure-forward"
gem "fluent-plugin-record-reformer"
gem "fluent-plugin-rewrite-tag-filter", "<2.0.0"
<% else %>
Copy link
Contributor

Choose a reason for hiding this comment

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

I don't think we need these version constraints here, the version constraints seem fine on the gem ...

Copy link
Contributor

Choose a reason for hiding this comment

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

Also it might be nicer to bump the versions up for all the other gems in a separate commit from adding fluent-plugin-rewrite-tag-filter, it will make the history cleaner ...

Copy link
Author

Choose a reason for hiding this comment

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

If I remove the version constraint, I don't think v0.12 gets the correct version. On top of that, I don't see v.1.1 being updated.

Copy link
Author

@naiduarvind naiduarvind Jul 2, 2018

Choose a reason for hiding this comment

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

Also it might be nicer to bump the versions up for all the other gems in a separate commit from adding fluent-plugin-rewrite-tag-filter, it will make the history cleaner ...

I have done this by forking the latest version of the master repo before making changes. Am I missing something in order to keep the history cleaner?

Copy link
Member

Choose a reason for hiding this comment

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

With bundler, correct version is installed because bundler uses different algorithm for resolving version dependency.

You can check the behaviour with following Gemfile.

source 'https://rubygems.org/'

#gem 'fluentd', '~> 1' # install rewrite-tag-filter v2
gem 'fluentd', '~> 0.12.0' # install rewrite-tag-filter v1
gem 'fluent-plugin-rewrite-tag-filter'

@naiduarvind
Copy link
Author

I have removed the version constraints. Do have a look at the generated files. Is there anything else that needs to be done for this PR to be merged?

cc: @errm @repeatedly

@repeatedly repeatedly merged commit 1be6199 into fluent:master Jul 3, 2018
@repeatedly
Copy link
Member

Thanks!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants