Bump fluent-bit to 3.2.2 and go version to 1.23.x (#176)

* upgrading fluentbit and go version
Co-authored-by: sramesh <[email protected]>

.github/workflows/pr.yaml

@@ -112,6 +112,7 @@ jobs:
         env:
           TRIVY_NON_SSL: true
           TRIVY_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-db
+          TRIVY_JAVA_DB_REPOSITORY: public.ecr.aws/aquasecurity/trivy-java-db
         uses: aquasecurity/[email protected]
         with:
           image-ref: registry:5000/fb-output-plugin-${{ matrix.name }}

Dockerfile

@@ -1,5 +1,5 @@
 # We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898
-FROM golang:1.20.7-bullseye AS builder
+FROM golang:1.23.6-bullseye AS builder
 
 WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output
 
@@ -10,15 +10,15 @@ COPY nrclient/ /go/src/github.com/newrelic/newrelic-fluent-bit-output/nrclient
 COPY record/ /go/src/github.com/newrelic/newrelic-fluent-bit-output/record
 COPY utils/ /go/src/github.com/newrelic/newrelic-fluent-bit-output/utils
 
-ENV SOURCE docker
+ENV SOURCE=docker
 
 # Not using default value here due to this: https://github.com/docker/buildx/issues/510
 ARG TARGETPLATFORM
 ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:3.1.9
+FROM fluent/fluent-bit:3.2.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/

Dockerfile.windows

@@ -1,6 +1,6 @@
 # escape=`
 
-ARG FLUENTBIT_VERSION=3.1.9
+ARG FLUENTBIT_VERSION=3.2.2
 ARG WINDOWS_VERSION=ltsc2019
 
 #################################################
@@ -30,7 +30,7 @@ RUN setx PATH "%PATH%;%ALLUSERSPROFILE%\chocolatey\bin"
 RUN choco install --yes --no-progress mingw git
 # We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898
 # The last 1.20.X version in chocolatey is 1.20.7
-RUN choco install --yes --no-progress golang --version=1.20.7
+RUN choco install --yes --no-progress golang --version=1.23.6
 
 # Put the path before the other paths so that MinGW shadows Windows commands.
 RUN setx PATH "C:\ProgramData\chocolatey\lib\mingw\tools\install\mingw\bin;%PATH%"
@@ -152,7 +152,7 @@ RUN vcpkg install --recurse openssl --triplet x64-windows-static; `
 
 
 # Install Chocolatey and OpenSSL: https://github.com/StefanScherer/dockerfiles-windows/blob/main/openssl/Dockerfile
-ENV chocolateyUseWindowsCompression false
+ENV chocolateyUseWindowsCompression=false
 RUN iex ((new-object net.webclient).DownloadString('https://chocolatey.org/install.ps1')); `
   choco feature disable --name showDownloadProgress ; 
   # choco install -y openssl;

Dockerfile_debug

@@ -1,5 +1,5 @@
 # We can't go past 1.20.X until this issue is solved: https://github.com/golang/go/issues/62130#issuecomment-1687335898
-FROM golang:1.20.7-bullseye AS builder
+FROM golang:1.23.6-bullseye AS builder
 
 WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output
 
@@ -18,7 +18,7 @@ ENV TARGETPLATFORM=${TARGETPLATFORM:-linux/amd64}
 RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
-FROM fluent/fluent-bit:3.1.9-debug
+FROM fluent/fluent-bit:3.2.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/

Dockerfile_firelens

@@ -3,6 +3,7 @@ FROM golang:1.20.7-bullseye AS builder
 
 WORKDIR /go/src/github.com/newrelic/newrelic-fluent-bit-output
 
+
 COPY Makefile go.* *.go /go/src/github.com/newrelic/newrelic-fluent-bit-output/
 COPY config/ /go/src/github.com/newrelic/newrelic-fluent-bit-output/config
 COPY metrics/ /go/src/github.com/newrelic/newrelic-fluent-bit-output/metrics
@@ -19,7 +20,7 @@ RUN echo "Building for ${TARGETPLATFORM} architecture"
 RUN make ${TARGETPLATFORM}
 
 # aws-for-fluent-bit 2.32.2.20240516 is based on Fluent Bit 1.9.10: https://github.com/aws/aws-for-fluent-bit/releases/tag/v2.32.2.20240516
-FROM amazon/aws-for-fluent-bit:2.32.2.20240516
+FROM amazon/aws-for-fluent-bit:2.32.5
 
 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/

version.go

@@ -1,3 +1,3 @@
 package main
 
-const VERSION = "2.1.0"
+const VERSION = "2.2.0"