fluent_logger_rails 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12def43c2930b106b0de428bf56f70bc474db386a257a2badac0b1ee398bdca4
-  data.tar.gz: a11c8a7176450aa8d0bf737105423d45e4ce4be33fa3b59d4d65099f7b35c0c7
+  metadata.gz: 768d6d458331d344eec86102de03dba87910ec455098ba412203d91af5e89d3b
+  data.tar.gz: 84e01b3b009488de4193a6b24833dbf03bd9d3e251fddcb6c50d9bab10b1f333
 SHA512:
-  metadata.gz: 251b265b1b628da9a3ec792da8ad3d5882100170ad87ff8d20d19da9f87331cbc728456b7204383744bfda32e84e703f7800426bef82a8914d83223dea3cf0ed
-  data.tar.gz: e3c66a633f44f7d8db4dccd7a00fd078f2fb52027c9992531b4424aef00cc81dc12b71f9197abcf77038ea23164284a08f04cd9e36c64479f293eeff0dfeb63f
+  metadata.gz: 2c4a1ecdc5430cdc4c5870433de60ce263cc09e7cc9f8f244a0aa414985c4e0617769656a7016eaebfeb9a86a0868432dc034632ee6083e8e8a9b878ca720587
+  data.tar.gz: 66e4c2f2dee83a4dfb03896840748b0d4dffbaeec500fa14a43bf1e9a776b32b747dcf75810b114d8c5e3689fe479cbab93c6b85f529b088afafeb04c9538ad6

data/.github/workflows/ruby.yml

@@ -9,9 +9,9 @@ name: Ruby
 
 on:
   push:
-    branches: [ master ]
+    branches: [ main ]
   pull_request:
-    branches: [ master ]
+    branches: [ main ]
 
 jobs:
   test:
@@ -21,7 +21,7 @@ jobs:
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.6
+        ruby-version: 2.7
     - name: Install dependencies
       run: bundle install
     - name: Run tests

data/CHANGELOG.md

@@ -13,6 +13,34 @@ Enhancements:
 Deprecations:
 * None
 
+## v0.6.0
+
+Bug Fixes:
+
+* None
+
+Enhancements:
+
+* Rails 7 support
+
+Deprecations:
+
+* None
+
+## v.0.5.0
+
+Bug Fixes:
+
+* None
+
+Enhancements:
+
+* Add option to allow message to be merged into payload (#8)
+
+Deprecations:
+
+* None
+
 ## v0.4.0
 
 Bug Fixes:

data/Gemfile.lock

@@ -1,25 +1,24 @@
 PATH
   remote: .
   specs:
-    fluent_logger_rails (0.4.0)
-      activesupport (>= 5.0, < 7)
+    fluent_logger_rails (0.6.0)
+      activesupport (>= 5.0, < 8)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.0)
+    activesupport (7.0.4.3)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     coderay (1.1.3)
-    concurrent-ruby (1.1.7)
+    concurrent-ruby (1.2.2)
     diff-lcs (1.4.4)
-    i18n (1.8.5)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
     method_source (1.0.0)
-    minitest (5.14.2)
+    minitest (5.18.0)
     pry (0.13.1)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -37,9 +36,8 @@ GEM
       rspec-support (~> 3.9.0)
     rspec-support (3.9.3)
     timecop (0.9.1)
-    tzinfo (2.0.3)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby

data/fluent_logger_rails.gemspec

@@ -11,13 +11,13 @@ Gem::Specification.new do |spec|
     "[Rails tagged logging](https://api.rubyonrails.org/classes/ActiveSupport/TaggedLogging.html) for JSON format "\
     "that can be sent to Fluentd (or really any other logging backend)."
   spec.authors     = ["HackerOne Open Source", "Ben Willis"]
-  spec.email       = ["opensource+fluent_logger_rails@hackerone.com", "ben@hackeroen.com"]
+  spec.email       = ["opensource+fluent_logger_rails@hackerone.com", "ben@hackerone.com"]
   spec.homepage      = "https://github.com/Hacker0x01/fluent_logger_rails"
 
   spec.license       = "MIT"
   spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 
-  spec.add_dependency('activesupport', '>= 5.0', '< 7')
+  spec.add_dependency('activesupport', '>= 5.0', '< 8')
 
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'timecop'

data/lib/fluent_logger_rails/tagged_hash_formatter.rb

@@ -6,18 +6,28 @@ module FluentLoggerRails
     # be set in order to not conflict or be overridden.
     attr_accessor :parent_key
 
-    def initialize
-      super
+    def initialize(merge_message_into_payload = false)
+      super()
+      @merge_message_into_payload = merge_message_into_payload
       # Override the Logger::Formatter default to a format that does not have a trailing space
       @datetime_format = "%Y-%m-%dT%H:%M:%S.%6N"
     end
 
     def call(severity, timestamp, _progname, msg)
-      payload = {
-        severity: format_severity(severity),
-        timestamp: format_datetime(timestamp),
-        message: msg.is_a?(String) ? msg.strip : msg,
-      }.merge(compact_tags.deep_dup)
+      payload = if msg.is_a?(Hash) && @merge_message_into_payload
+        msg
+      else
+        {
+          message: msg.is_a?(String) ? msg.strip : msg,
+        }
+      end
+
+      payload = payload.merge(
+        {
+          severity: format_severity(severity),
+          timestamp: format_datetime(timestamp),
+        },
+      ).merge(compact_tags.deep_dup)
 
       @parent_key ? { @parent_key => payload } : payload
     end

data/lib/fluent_logger_rails/version.rb

@@ -1,3 +1,3 @@
 module FluentLoggerRails
-  VERSION = '0.4.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: fluent_logger_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.6.0
 platform: ruby
 authors:
 - HackerOne Open Source
 - Ben Willis
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
 date: 2020-07-14 00:00:00.000000000 Z
@@ -20,7 +20,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -79,7 +79,7 @@ description: This is a library that wraps the [fluent-logger gem](https://github
   for JSON format that can be sent to Fluentd (or really any other logging backend).
 email:
 - opensource+fluent_logger_rails@hackerone.com
-- ben@hackeroen.com
+- ben@hackerone.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -105,7 +105,7 @@ metadata:
   homepage_uri: https://github.com/Hacker0x01/fluent_logger_rails
   source_code_uri: https://github.com/Hacker0x01/fluent_logger_rails
   changelog_uri: https://github.com/Hacker0x01/fluent_logger_rails/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -120,8 +120,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: A wrapper for fluent-logger gem with support for tagged logging
 test_files: []