NR-91173 feat: fluent bit 2.x under FF (#1587)

* NR-91173 feat: fluent bit 2.x under FF

* add FB to al2023 amd64

* rename fb exe consts. clear vars in tests

* NR-91173: add testLogger in ffhandler tests

---------

Co-authored-by: Roger Coll <rogercoll@protonmail.com>

build/goreleaser/linux/al2023_amd64.yml

@@ -74,7 +74,7 @@
       summary: "New Relic Infrastructure Agent"
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
-#    recommends:
-#      - td-agent-bit
+    recommends:
+      - fluent-bit
 
   # end AL2023 adm64

build/goreleaser/linux/al2023_arm.yml

@@ -73,6 +73,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+    # FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end AL2023 arm

build/goreleaser/linux/al2023_arm64.yml

@@ -72,6 +72,6 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+#      - fluent-bit
 
   # end AL2023 arm64

build/goreleaser/linux/al2_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
     dependencies:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end AL2 adm64

build/goreleaser/linux/al2_arm.yml

@@ -73,6 +73,8 @@
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
 #    dependencies:
-#      - td-agent-bit
+    # FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end AL2 arm

build/goreleaser/linux/al2_arm64.yml

@@ -72,6 +72,7 @@
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
     dependencies:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end AL2 arm64

build/goreleaser/linux/centos_6_amd64.yml

@@ -61,8 +61,9 @@
       summary: "New Relic Infrastructure Agent"
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies.
-    # disabled as right now fb pkg is not built for centos-6
   #    dependencies:
-  #      - td-agent-bit
+    # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end CentOS 6 amd64

build/goreleaser/linux/centos_7_amd64.yml

@@ -74,6 +74,7 @@
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
     dependencies:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end CentOS 7 amd64

build/goreleaser/linux/centos_7_arm.yml

@@ -71,8 +71,9 @@
       summary: "New Relic Infrastructure Agent"
       group: default
     # Required packages. rpm version 4.11.3 does not support weak dependencies
-    # disabled until logging packaging is properly handled for arm
   #    dependencies:
-  #      - td-agent-bit
+    # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end CentOS 7 arm

build/goreleaser/linux/centos_7_arm64.yml

@@ -73,6 +73,7 @@
     # Required packages. rpm version 4.11.3 does not support weak dependencies
     # disabled until logging packaging is properly handled for arm
     dependencies:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end CentOS 7 arm64

build/goreleaser/linux/centos_8_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end CentOS 8 amd64

build/goreleaser/linux/centos_8_arm.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+    # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end CentOS 8 arm

build/goreleaser/linux/centos_8_arm64.yml

@@ -72,6 +72,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end CentOS 8 arm64

build/goreleaser/linux/debian_systemd_amd64.yml

@@ -63,6 +63,7 @@
     priority: extra
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end Debian systemd amd64

build/goreleaser/linux/debian_systemd_arm.yml

@@ -63,6 +63,8 @@
     priority: extra
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+# FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end Debian systemd arm

build/goreleaser/linux/debian_systemd_arm64.yml

@@ -63,6 +63,7 @@
     priority: extra
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end Debian systemd arm64

build/goreleaser/linux/debian_upstart_amd64.yml

@@ -59,6 +59,7 @@
     priority: extra
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end Debian upstart amd64

build/goreleaser/linux/rhel_9_amd64.yml

@@ -40,10 +40,10 @@
         dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/amd64/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
         dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-#      - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
-#        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
-#      - src: 'assets/examples/logging/parsers.conf'
-#        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
+      - src: 'target/fluent-bit-plugin/amd64/out_newrelic.so'
+        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
+      - src: 'assets/examples/logging/parsers.conf'
+        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
@@ -73,9 +73,8 @@
 
       summary: "New Relic Infrastructure Agent"
       group: default
-    # Required packages. rpm version 4.11.3 does not support weak dependencies
-# not supported yet
-#    dependencies:
-#      - td-agent-bit
+    # Recommended packages. If they fail to install installation of the agent will not be interrupted.
+    recommends:
+      - fluent-bit
 
   # end RHEL 9 amd64

build/goreleaser/linux/rhel_9_arm.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+# FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end RHEL 9 arm

build/goreleaser/linux/rhel_9_arm64.yml

@@ -40,10 +40,10 @@
         dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-flex'
       - src: 'target/nriprometheus/{{ .Arch }}/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
         dst: '/var/db/newrelic-infra/newrelic-integrations/bin/nri-prometheus'
-#      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
-#        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
-#      - src: 'assets/examples/logging/parsers.conf'
-#        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
+      - src: 'target/fluent-bit-plugin/{{ .Arch }}/out_newrelic.so'
+        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/out_newrelic.so'
+      - src: 'assets/examples/logging/parsers.conf'
+        dst: '/var/db/newrelic-infra/newrelic-integrations/logging/parsers.conf'
     empty_folders:
       - /var/db/newrelic-infra/custom-integrations
       - /var/db/newrelic-infra/integrations.d
@@ -71,8 +71,7 @@
       summary: "New Relic Infrastructure Agent"
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
-# not supported yet
-#    dependencies:
-#      - td-agent-bit
+    recommends:
+      - fluent-bit
 
   # end RHEL 9 arm64

build/goreleaser/linux/sles_114_amd64.yml

@@ -57,6 +57,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+# FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end SLES 11.4 amd64

build/goreleaser/linux/sles_121_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 12.1 amd64

build/goreleaser/linux/sles_122_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 12.2 amd64

build/goreleaser/linux/sles_122_arm.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+# FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end SLES 12.2 arm

build/goreleaser/linux/sles_122_arm64.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+# FB not supported yet
+#      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+#      - fluent-bit
 
   # end SLES 12.2 arm64

build/goreleaser/linux/sles_123_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 12.3 amd64

build/goreleaser/linux/sles_123_arm.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 12.3 arm

build/goreleaser/linux/sles_123_arm64.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 12.3 arm64

build/goreleaser/linux/sles_124_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 12.4 amd64

build/goreleaser/linux/sles_124_arm.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 12.4 arm

build/goreleaser/linux/sles_124_arm64.yml

@@ -72,6 +72,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 12.4 arm64

build/goreleaser/linux/sles_125_amd64.yml

@@ -77,6 +77,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 12.5 amd64

build/goreleaser/linux/sles_125_arm64.yml

@@ -73,6 +73,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 12.5 arm64

build/goreleaser/linux/sles_151_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 15.1 amd64

build/goreleaser/linux/sles_151_arm64.yml

@@ -73,6 +73,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 15.1 arm64

build/goreleaser/linux/sles_152_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 15.2 amd64

build/goreleaser/linux/sles_152_arm64.yml

@@ -73,6 +73,8 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
 #    recommends:
-#      - td-agent-bit
+  # FB not supported yet
+  #      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+  #      - fluent-bit
 
   # end SLES 15.2 arm64

build/goreleaser/linux/sles_153_amd64.yml

@@ -75,6 +75,7 @@
       group: default
     # Recommended packages. If they fail to install installation of the agent will not be interrupted.
     recommends:
-      - td-agent-bit
+      - td-agent-bit #To be removed on removal of the ff fluent_bit_19
+      - fluent-bit
 
   # end SLES 15.3 amd64