fluent-logger 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35434f35801a28fb88c9802cfd213caa4a9a052f087241768f676b0f7c67958a
-  data.tar.gz: cf2b26bbf41d008c9c3e462a0dcd5e2c23cfbdbc9c08227d31454d4b171abb83
+  metadata.gz: 3df64fcf7bf38ee6e2e66c816279927a1fe6d9622a711c52b84a739745422e7c
+  data.tar.gz: dff1768c55cb33e57d01991ae91cad43ba752339c6f4db34582c06f9b0dfbf6e
 SHA512:
-  metadata.gz: 899bccf2efee5b4c230155e1ef6beb9fa4b1f06b843fb9abd5f87630246f1f112b75200fa0d431de3aeba5e9dbf13e55a97fa3b57945112530cdda57288d1cc7
-  data.tar.gz: 8bebd7215231cef3379b5a6e9ccdc72407b0198874d44860033056cc97600dce811a5929cf13533bd42e1954c24fe01b9de5c27037a57a6b4354b6adbe41e393
+  metadata.gz: 82664c96b896ffbb37dc5d56292ef228db3c521a2c57736053b138ce75944524dad7d6c39616ede1a756d78859d51c2859ad45c2745c6cb78ee82b4de05d77d9
+  data.tar.gz: f9ccd114b9109fd2f3b06af62d03dc21c4d5e97c58555b9aa5dfc31ae491c13e67c605076c7cbedb03ab1a892d958d6f991d6a79197f8cea9e48201b5d19114b

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'monthly'

data/.github/workflows/linux.yml

@@ -1,22 +1,36 @@
 name: linux
 on:
-  - push
-  - pull_request
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  schedule:
+    - cron: '0 0 1 * *'
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 3.2
   build:
+    needs: ruby-versions
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        ruby:
-          - '3.2'
-          - '3.3'
-          - '3.4'
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
+        exclude:
+          - ruby: head
         os:
           - ubuntu-latest
-    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }}
+        gemfile:
+          - activesupport
+          - no-activesupport
+    env:
+      BUNDLE_GEMFILE: spec/gemfiles/${{ matrix.gemfile }}.gemfile
+    name: Ruby ${{ matrix.ruby }} unit testing on ${{ matrix.os }} (${{ matrix.gemfile }})
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}

data/.gitignore

@@ -1,4 +1,5 @@
 .bundle
+spec/gemfiles/*.gemfile.lock
 Gemfile.lock
 pkg/*
 coverage/*

data/ChangeLog

@@ -1,3 +1,9 @@
+Release 0.11.0 - 2026/09/07
+
+  * Add ActiveSupport Supports (#112)
+  * level_fluent_logger: call super to improve compatibility with logger (#108)
+  * Add infos to gemspec file (#110)
+
 Release 0.10.0 - 2025/09/04
 
   * Add timeout option (#104)

data/Gemfile.v0.12

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gem 'json', '= 1.8.3'
 gem 'fluentd', '~> 0.12.0'

data/fluent-logger.gemspec

@@ -15,6 +15,10 @@ Gem::Specification.new do |gem|
   gem.description = %q{fluent logger for ruby}
   gem.summary     = gem.description
 
+  gem.metadata['changelog_uri'] = "https://github.com/fluent/fluent-logger-ruby/blob/master/ChangeLog"
+  gem.metadata['source_code_uri'] = "https://github.com/fluent/fluent-logger-ruby"
+  gem.metadata['bug_tracker_uri'] = "https://github.com/fluent/fluent-logger-ruby/issues"
+
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }

data/lib/fluent/logger/fluent_logger.rb

@@ -49,6 +49,14 @@ module Fluent
       def to_json(*args)
         @sec.to_s
       end
+
+      def as_json(*args)
+        # For ActiveSupport.
+        # By default, the custom classes are represented by their own instance variables.
+        # https://github.com/rails/rails/blob/87a9fdeef81f293cd972464686a6b4470ec642a2/activesupport/lib/active_support/core_ext/object/json.rb#L63
+        # Define it in a way that results in proper data structure when expressed in JSON
+        @sec
+      end
     end
 
     class FluentLogger < LoggerBase
@@ -235,7 +243,7 @@ module Fluent
           res = begin
                   @packer.pack(msg).to_s
                 rescue NoMethodError
-                  JSON.parse(JSON.generate(msg)).to_msgpack
+                  JSON.parse(msg.to_json).to_msgpack
                 ensure
                   @packer.clear
                 end

data/lib/fluent/logger/level_fluent_logger.rb

@@ -26,7 +26,8 @@ module Fluent
     class LevelFluentLogger < ::Logger
 
       def initialize(tag_prefix = nil, *args)
-        @level = ::Logger::DEBUG
+        super(nil)
+
         @default_formatter = proc do |severity, datetime, progname, message|
           map = { level: severity }
           map[:message] = message if message

data/lib/fluent/logger/version.rb

@@ -1,5 +1,5 @@
 module Fluent
   module Logger
-    VERSION = '0.10.0'
+    VERSION = '0.11.0'
   end
 end

data/spec/fluent_logger_spec.rb

@@ -8,6 +8,11 @@ require 'stringio'
 require 'fluent/logger/fluent_logger/cui'
 require 'timeout'
 
+begin
+  require 'active_support/json'
+rescue LoadError
+end
+
 describe Fluent::Logger::FluentLogger do
   let(:fluentd) {
     DummyFluentd.new
@@ -176,7 +181,12 @@ describe Fluent::Logger::FluentLogger do
         logger.post('tag', data)
         fluentd.wait_transfer
         logger_data = fluentd.queue.last.last
-        expect(logger_data['time']).to eq '2008-09-01 10:05:00 UTC'
+        if defined?(ActiveSupport)
+          expect(logger_data['time']).to eq '2008-09-01T10:05:00.000Z'
+        else
+          expect(logger_data['time']).to eq '2008-09-01 10:05:00 UTC'
+        end
+
         expect(logger_data['proc']).to be_truthy
         expect(logger_data['object']).to be_truthy
       }
@@ -188,7 +198,11 @@ describe Fluent::Logger::FluentLogger do
         fluentd.wait_transfer
 
         logger_data1 = fluentd.queue.first.last
-        expect(logger_data1['time']).to eq '2008-09-01 10:05:00 UTC'
+        if defined?(ActiveSupport)
+          expect(logger_data1['time']).to eq '2008-09-01T10:05:00.000Z'
+        else
+          expect(logger_data1['time']).to eq '2008-09-01 10:05:00 UTC'
+        end
 
         logger_data2 = fluentd.queue.last.last
         expect(logger_data2['time']).to eq '2008-09-01 10:05:00 UTC'
@@ -199,13 +213,19 @@ describe Fluent::Logger::FluentLogger do
           'time'   => Time.utc(2008, 9, 1, 10, 5, 0),
           'object' => Object.new,
           'proc'   => proc { 1 },
-          'NaN'    => (0.0/0.0) # JSON don't convert
+          'NaN'    => (0.0/0.0) # JSON don't convert by default
         }
         logger.post('tag', data)
         fluentd.wait_transfer
-        expect(fluentd.queue.last).to be_nil
-        logger_io.rewind
-        logger_io.read =~ /FluentLogger: Can't convert to msgpack:/
+        if defined?(ActiveSupport)
+          # activesupport converts NaN to nil
+          # https://github.com/rails/rails/blob/90a1eaa1b30ba1f2d524e197460e549c03cf5698/activesupport/lib/active_support/core_ext/object/json.rb#L117-L118
+          expect(fluentd.queue.last).to eq ['logger-test.tag', {"NaN" => nil, "object" => {}, "proc" => {}, "time" => "2008-09-01T10:05:00.000Z"}]
+        else
+          expect(fluentd.queue.last).to be_nil
+          logger_io.rewind
+          expect(logger_io.read).to match(/FluentLogger: Can't convert to msgpack:/)
+        end
 
         logger.post('tag', { 'a' => 'b' })
         fluentd.wait_transfer

data/spec/gemfiles/activesupport.gemfile

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+# Load common dependencies
+eval_gemfile("../../Gemfile")
+
+# Add custom dependencies
+gem "activesupport"

data/spec/gemfiles/no-activesupport.gemfile

@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Load common dependencies
+eval_gemfile("../../Gemfile")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
@@ -50,6 +50,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/linux.yml"
 - ".gitignore"
 - ".rspec"
@@ -75,6 +76,8 @@ files:
 - lib/fluent/logger/version.rb
 - spec/console_logger_spec.rb
 - spec/fluent_logger_spec.rb
+- spec/gemfiles/activesupport.gemfile
+- spec/gemfiles/no-activesupport.gemfile
 - spec/level_fluent_logger_spec.rb
 - spec/logger_base_spec.rb
 - spec/logger_spec.rb
@@ -88,7 +91,10 @@ files:
 homepage: https://github.com/fluent/fluent-logger-ruby
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  changelog_uri: https://github.com/fluent/fluent-logger-ruby/blob/master/ChangeLog
+  source_code_uri: https://github.com/fluent/fluent-logger-ruby
+  bug_tracker_uri: https://github.com/fluent/fluent-logger-ruby/issues
 rdoc_options: []
 require_paths:
 - lib
@@ -103,12 +109,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.9
+rubygems_version: 4.0.18
 specification_version: 4
 summary: fluent logger for ruby
 test_files:
 - spec/console_logger_spec.rb
 - spec/fluent_logger_spec.rb
+- spec/gemfiles/activesupport.gemfile
+- spec/gemfiles/no-activesupport.gemfile
 - spec/level_fluent_logger_spec.rb
 - spec/logger_base_spec.rb
 - spec/logger_spec.rb