Bump version to 2.21.1 #265

matthewfala · 2021-10-29T01:52:21Z

Signed-off-by: Matthew Fala [email protected]

This build relies on a branch on my fork which contains 1.8.9 + the same commits we cherry-picked into the last release for the TLS and mbedtls fixes: https://github.com/matthewfala/fluent-bit/tree/1_8_9_patch

# Apply Fluent Bit TLS and mbedtls Patch
git fetch https://github.com/krispraws/fluent-bit.git tls_net_read_fix \
  && git cherry-pick 8d1cfeb5ba830b360fe6e1228190ed900842a3ea; \
git fetch https://github.com/zhonghui12/fluent-bit.git custom-1.8.7 \
  && git cherry-pick 30fc6305695623cbc95d51df07ae185dfec8bff2

By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.

matthewfala · 2021-10-29T02:01:28Z

Dockerfile

 WORKDIR /tmp/fluent-bit-$FLB_VERSION/build/
-RUN git fetch origin && git checkout 1_8_8_patch && git status
+RUN git fetch origin && git checkout 1_8_9_patch && git status
 RUN cmake -DFLB_RELEASE=On \


We could technically apply the patch in Docker after the git clone instead of doing a branch checkout via:

git fetch https://github.com/krispraws/fluent-bit.git tls_net_read_fix \ && git cherry-pick 8d1cfeb5ba830b360fe6e1228190ed900842a3ea; \ git fetch https://github.com/zhonghui12/fluent-bit.git custom-1.8.7 \ && git cherry-pick 30fc6305695623cbc95d51df07ae185dfec8bff2

I am afraid of doing this because there wouldn't be a good way to verify that the commits were successfully applied.

yea doing it via a pre-prepped branch that the code reviewer can check is better

I prefer current approach. We can do all the testing beforehand. Reviewer can go to that specific branch and check all the changes. One branch for one release sounds logical.

PettitWesley · 2021-10-29T03:29:46Z

CHANGELOG.md

+Compared to `2.21.0` this release adds:
+* Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098)
+* Bug - Downgrade `mbedtls` to 2.24.0 to fix the performance regression issue in `mbedtls` 2.26.0 [fluentbit:4110](https://github.com/fluent/fluent-bit/issues/4110)


the "Compared to 2.21.0" is wrong/misleading since we added these commits in the last release as well. I think we need a special statement on this like, "Same as 2.21.0, this release includes the following fixes for AWS customers that we are working on getting accepted upstream"

I am not sure if we want to mention this: avoid double free for multiline buffer fix- fluent/fluent-bit#4243

there's an AWS for Fluent Bit issue for that one, so let's mention it

Thank you Rayhan and Wesley. I'll keep the "Compared to" version, and add the bug fix @hossain-rayhan mentioned.

PettitWesley · 2021-10-29T03:34:53Z

CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog

+### 2.22.0


I think this should be a patch release? 2.21.1? I don't see any changes which are relevant to AWS customers which are non-bug fixes.

Also, I think the release notes should reference this issue: fluent/fluent-bit#3886

Which TONS of our customers have been waiting for to be fixed.

But this is a new Fluent Bit version, right? So, I think we upgraded minor version for this earlier? Maybe 2.22.0 is OK.

But this is a new Fluent Bit version, right?

Yes but its a new patch version.

Though strictly speaking that doesn't mean anything much since upstream doesn't follow SemVer.

However, in our distro, we try to follow SemVer, at least changes that pertain to AWS customers. Hence this means:

Patch bump: from the POV of our customers, there are only bug fixes

Minor bump: from the POV of our customers, there are net new features

This allows our customers to immediately know roughly how different this version is from the last one using the number alone.

In this case, AFAICT, this should be a patch bump, since there are only bug fixes for our customers.

Ok. 2.21.1 it is.

matthewfala

Revision diff

$ git diff
diff --git a/AWS_FOR_FLUENT_BIT_VERSION b/AWS_FOR_FLUENT_BIT_VERSION
index f1270b4..bd9c559 100644
--- a/AWS_FOR_FLUENT_BIT_VERSION
+++ b/AWS_FOR_FLUENT_BIT_VERSION
@@ -1 +1 @@
-2.22.0
\ No newline at end of file
+2.21.1
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d7dc1f..ed93fe2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Changelog
 
-### 2.22.0
+### 2.21.1
 This release includes:
 * An Amazon Linux 2 Base
 * Fluent Bit [1.8.9](https://fluentbit.io/announcements/v1.8.9/)
@@ -9,6 +9,7 @@ This release includes:
 * Amazon Kinesis Firehose for Fluent Bit 1.6.1
 
 Compared to `2.21.0` this release adds:
+* Bug - Avoid double free for multiline buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)
 * Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098)
 * Bug - Downgrade `mbedtls` to 2.24.0 to fix the performance regression issue in `mbedtls` 2.26.0 [fluentbit:4110](https://github.com/fluent/fluent-bit/issues/4110)

matthewfala · 2021-10-29T19:44:24Z

AWS_FOR_FLUENT_BIT_VERSION

Changed to 2.21.1

matthewfala · 2021-10-29T19:44:36Z

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog

+### 2.21.1


Changed to 2.21.1

matthewfala · 2021-10-29T19:44:54Z

CHANGELOG.md

+* Amazon Kinesis Firehose for Fluent Bit 1.6.1
+
+Compared to `2.21.0` this release adds:
+* Bug - Avoid double free for multiline buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)


Added bug fix report

matthewfala · 2021-10-29T19:45:24Z

CHANGELOG.md

+* Amazon Kinesis Streams for Fluent Bit 1.8.0
+* Amazon Kinesis Firehose for Fluent Bit 1.6.1
+
+Compared to `2.21.0` this release adds:


Kept "Compared to..." since we have an actual bug fix from @hossain-rayhan

yea but the compared too isn't true for the other ones. So Its still a lie. I think we should change the language for the 2 fixes we keep adding in.

Oh okay. I see. Will fix.

matthewfala

Second diff

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed93fe2..e71ab37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,7 +9,10 @@ This release includes:
 * Amazon Kinesis Firehose for Fluent Bit 1.6.1
 
 Compared to `2.21.0` this release adds:
-* Bug - Avoid double free for multiline buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)
+* Bug - Avoid double free for multiline msgpack buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)
+* Bug - On Multiline handling, use file inode as stream_id [fluentbit:3886](https://github.com/fluent/fluent-bit/issues/3886)
+
+Same as `2.21.0`, this release includes the following fixes for AWS customers that we are working on getting accepted upstream:
 * Bug - Fix return value from `tls_net_read` [fluentbit:4098](https://github.com/fluent/fluent-bit/issues/4098)
 * Bug - Downgrade `mbedtls` to 2.24.0 to fix the performance regression issue in `mbedtls` 2.26.0 [fluentbit:4110](https://github.com/fluent/fluent-bit/issues/4110)

matthewfala · 2021-10-29T20:15:01Z

CHANGELOG.md

+* Bug - Avoid double free for multiline msgpack buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)
+* Bug - On Multiline handling, use file inode as stream_id [fluentbit:3886](https://github.com/fluent/fluent-bit/issues/3886)
+
+Same as `2.21.0`, this release includes the following fixes for AWS customers that we are working on getting accepted upstream:


Alter format of AWS image specific patch callout

matthewfala · 2021-10-29T20:15:38Z

CHANGELOG.md

+
+Compared to `2.21.0` this release adds:
+* Bug - Avoid double free for multiline msgpack buffer [fluentbit:4243](https://github.com/fluent/fluent-bit/pull/4243)
+* Bug - On Multiline handling, use file inode as stream_id [fluentbit:3886](https://github.com/fluent/fluent-bit/issues/3886)


Add Multiline handling bug fix callout

zhonghui12 · 2021-11-01T21:37:42Z

The commit message needs to be updated to Bump version to 2.21.1 as well

Signed-off-by: Matthew Fala <[email protected]>

matthewfala requested a review from a team as a code owner October 29, 2021 01:52

matthewfala commented Oct 29, 2021

View reviewed changes

PettitWesley reviewed Oct 29, 2021

View reviewed changes

matthewfala changed the title ~~Bump version to 2.22.0~~ Bump version to 2.21.1 Oct 29, 2021

matthewfala force-pushed the bump-2.22.0 branch from 6ca7d9f to 1d8085f Compare October 29, 2021 19:43

matthewfala commented Oct 29, 2021

View reviewed changes

matthewfala requested a review from hossain-rayhan October 29, 2021 19:47

matthewfala force-pushed the bump-2.22.0 branch from 1d8085f to a31b3ee Compare October 29, 2021 20:12

matthewfala commented Oct 29, 2021

View reviewed changes

PettitWesley approved these changes Oct 29, 2021

View reviewed changes

Bump version to 2.21.1

b29c470

Signed-off-by: Matthew Fala <[email protected]>

matthewfala force-pushed the bump-2.22.0 branch from a31b3ee to b29c470 Compare November 1, 2021 21:46

matthewfala merged commit af403de into aws:mainline Nov 1, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump version to 2.21.1 #265

Bump version to 2.21.1 #265

matthewfala commented Oct 29, 2021 •

edited

Loading

matthewfala Oct 29, 2021

PettitWesley Oct 29, 2021

hossain-rayhan Oct 29, 2021

PettitWesley Oct 29, 2021

hossain-rayhan Oct 29, 2021

PettitWesley Oct 29, 2021

matthewfala Oct 29, 2021

PettitWesley Oct 29, 2021

hossain-rayhan Oct 29, 2021

PettitWesley Oct 29, 2021

matthewfala Oct 29, 2021

matthewfala left a comment

matthewfala Oct 29, 2021

matthewfala Oct 29, 2021

matthewfala Oct 29, 2021

matthewfala Oct 29, 2021

PettitWesley Oct 29, 2021

matthewfala Oct 29, 2021

matthewfala left a comment

matthewfala Oct 29, 2021

matthewfala Oct 29, 2021

zhonghui12 commented Nov 1, 2021

Bump version to 2.21.1 #265

Bump version to 2.21.1 #265

Conversation

matthewfala commented Oct 29, 2021 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthewfala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

matthewfala left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

zhonghui12 commented Nov 1, 2021

matthewfala commented Oct 29, 2021 •

edited

Loading