fluent-plugin-newrelic 1.2.1 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11df01d6cf7ef5b768dabccfc1d57f0aa7bf3bbd96010ab0d9109b0dae65434e
-  data.tar.gz: bd8b44e862c08b809fb7ad08913d679dca2ff13d3029dca8c6c31656fa317676
+  metadata.gz: d4be95038976a5e5e708c6fdc9d733a7293aaf63461fb67378f953cc093df633
+  data.tar.gz: 9cc28ceaa43fbaf330c631a2614ba911802bf442ac540b27b2ff23d58cadab2c
 SHA512:
-  metadata.gz: 2f5b0a413c051418c0635352cac3bbac7b039c00c4fef14d694cd3a531111e07f85dc9f44d87641b774cc00869a51574e161644b3fc3392c257284e0342aeead
-  data.tar.gz: b8da217e0801af5053fad0539680348e5e94eeec56ddf4a67872c63afd968c53647ba2cde5b98424392b2104675298ee62a29e74bbc41d5790a0aad9911c23b7
+  metadata.gz: 27e2a425b516c5570c81b9680f1357e5fe27f9f9ebcbf885eeee6f30bd8402cc8d962b0fad3a7984a83e0528e1e17213a56421ccbeb83000408b122bbae52ac0
+  data.tar.gz: 6bc8cab7df418903885686e1da65f8de0e0704061af18f6fcf389d88b40be9eeed9bd48d55372c1ffac109f38c8633013541dedeb2b8bd2384922411dca7e810

data/.github/workflows/merge-to-master.yml

@@ -8,7 +8,7 @@ on:
 jobs:
   ci:
     name: Continuous Delivery pipeline
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code

data/.github/workflows/pr.yml

@@ -5,7 +5,7 @@ on: [pull_request]
 jobs:
   ci:
     name: Continuous Integration pipeline
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
 
     steps:
       - name: Checkout code
@@ -21,8 +21,7 @@ jobs:
         run: bundle exec rake
 
       - name: Publish Unit Test Results
-        uses: EnricoMi/publish-unit-test-result-action@v1.5
+        uses: EnricoMi/publish-unit-test-result-action@v1.19
         if: always()
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          files: '**/TEST-*.xml'
+          files: '**/TEST-*.xml'

data/lib/fluent/plugin/out_newrelic.rb

@@ -75,11 +75,8 @@ module Fluent
       end
 
       def package_record(record, timestamp)
-        if defined? timestamp.nsec
-          timestamp = timestamp * 1000 + timestamp.nsec / 1_000_000
-        end
         packaged = {
-          'timestamp' => timestamp,
+          'timestamp' => resolveTimestamp(record['timestamp'], timestamp),
           # non-intrinsic attributes get put into 'attributes'
           'attributes' => record
         }
@@ -141,6 +138,7 @@ module Fluent
           return [compressed_payload]
         end
 
+        compressed_payload_bytesize = compressed_payload.bytesize
         compressed_payload = nil # Free for GC
 
         if logs.length > 1 # we can split
@@ -150,7 +148,8 @@ module Fluent
           second_half = get_compressed_payloads(logs.slice(midpoint, logs.length))
           return first_half + second_half
         else
-          log.error("Can't compress record below required maximum packet size and it will be discarded. Record: #{logs[0]}")
+          log.error("Can't compress record below required maximum packet size and it will be discarded. " +
+                      "Record timestamp: #{logs[0]['timestamp']}. Compressed size: #{compressed_payload_bytesize} bytes. Uncompressed size: #{payload.to_json.bytesize} bytes.")
           return []
         end
       end
@@ -181,6 +180,17 @@ module Fluent
         gzip.close
         io.string
       end
+
+      def resolveTimestamp(recordTimestamp, fluentdTimestamp)
+        if recordTimestamp
+          recordTimestamp
+        else
+          if defined? fluentdTimestamp.nsec
+            fluentdTimestamp = fluentdTimestamp * 1000 + fluentdTimestamp.nsec / 1_000_000
+          end
+          fluentdTimestamp
+        end
+      end
     end
   end
 end

data/lib/newrelic-fluentd-output/version.rb

@@ -1,3 +1,3 @@
 module NewrelicFluentdOutput
-  VERSION = "1.2.1"
+  VERSION = "1.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-newrelic
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.3
 platform: ruby
 authors:
 - New Relic Logging Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-30 00:00:00.000000000 Z
+date: 2024-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd