From 747dc5cf609ae298e2a255613aa9bddcc233d1cb Mon Sep 17 00:00:00 2001
From: Maya Jha <mjha@newrelic.com>
Date: Wed, 18 Sep 2024 14:10:57 +0530
Subject: [PATCH] Upgrade fluentbit version to 3.1.2 (#166)

* Upgrade fluentbit version to 3.1.2

* fix issue with github action not recognizing docker-compose

* Add a . to trigger rerun of GH actions
---
 DEVELOPER.md       |  2 +-
 Dockerfile         |  2 +-
 Dockerfile.windows |  2 +-
 Dockerfile_debug   |  2 +-
 test.sh            | 10 +++++-----
 version.go         |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/DEVELOPER.md b/DEVELOPER.md
index 7f28d8a5..23de968d 100644
--- a/DEVELOPER.md
+++ b/DEVELOPER.md
@@ -2,7 +2,7 @@
 
 ## Prerequisites
 - Fluent Bit
-- A Go environment. On Mac,you can install it with `brew install go`
+- A Go environment. On Mac,you can install it with `brew install go`.
 - Cross-compilation requirements (optional, only required when building for non-native platforms):
     - For `linux/arm64` cross-compilation: `aarch64-linux-gnu-gcc` and `aarch64-linux-gnu-g++` compilers.
     - For `linux/arm/v7` cross-compilation: `arm-linux-gnueabihf-gcc` and `arm-linux-gnueabihf-g++` compilers.
diff --git a/Dockerfile b/Dockerfile
index 3650bb26..86c2939f 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,7 +18,7 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:3.0.4
+FROM fluent/fluent-bit:3.1.2
 
 COPY --from=builder /go/src/github.com/newrelic/newrelic-fluent-bit-output/out_newrelic-linux-*.so /fluent-bit/bin/out_newrelic.so
 COPY *.conf /fluent-bit/etc/
diff --git a/Dockerfile.windows b/Dockerfile.windows
index e925fcb4..0457063d 100644
--- a/Dockerfile.windows
+++ b/Dockerfile.windows
@@ -1,6 +1,6 @@
 # escape=`
 
-ARG FLUENTBIT_VERSION=3.0.4
+ARG FLUENTBIT_VERSION=3.1.2
 ARG WINDOWS_VERSION=ltsc2019
 
 #################################################
diff --git a/Dockerfile_debug b/Dockerfile_debug
index 3a9b501d..f0556377 100644
--- a/Dockerfile_debug
+++ b/Dockerfile_debug
@@ -18,7 +18,7 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:3.0.4-debug
+FROM fluent/fluent-bit:3.1.2-debug
 
 COPY --from=builder /go/src/github.com/newrelic/newrelic-fluent-bit-output/out_newrelic-linux-*.so /fluent-bit/bin/out_newrelic.so
 COPY *.conf /fluent-bit/etc/
diff --git a/test.sh b/test.sh
index e193c638..f6b0cacf 100755
--- a/test.sh
+++ b/test.sh
@@ -8,14 +8,14 @@ clean_up () {
     if [[ $ARG -ne 0 ]]; then
       echo "Test failed, showing docker logs"
       echo "- Mockserver"
-      docker-compose -f ./test/docker-compose.yml logs mockserver
+      docker compose -f ./test/docker-compose.yml logs mockserver
       echo "- Fluent Bit"
-      docker-compose -f ./test/docker-compose.yml logs newrelic-fluent-bit-output
+      docker compose -f ./test/docker-compose.yml logs newrelic-fluent-bit-output
     fi
 
     echo "Cleaning up"
     rm -r ./test/testdata || true
-    docker-compose -f ./test/docker-compose.yml down
+    docker compose -f ./test/docker-compose.yml down
 
     exit $ARG
 }
@@ -41,7 +41,7 @@ function run_test {
   touch ./test/testdata/fbtest.log
 
   echo "Starting docker compose"
-  docker-compose -f ./test/docker-compose.yml up -d
+  docker compose -f ./test/docker-compose.yml up -d
 
   # Waiting mockserver to be ready
   max_retry=10
@@ -79,7 +79,7 @@ function run_test {
 
   echo "Tearing down test for image ${NR_FB_IMAGE}"
   rm -r ./test/testdata || true
-  docker-compose -f ./test/docker-compose.yml down
+  docker compose -f ./test/docker-compose.yml down
 }
 
 
diff --git a/version.go b/version.go
index 200dacbc..b4876288 100644
--- a/version.go
+++ b/version.go
@@ -1,3 +1,3 @@
 package main
 
-const VERSION = "2.0.1"
+const VERSION = "2.0.2"