fluent-logger 0.9.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 460c4365ba58c7558db145e551b806ee8b2afb764454bfbba35e6f6290093317
-  data.tar.gz: 5166f31570a03e934c217464a2d16706f82bd650581f43d83ee87c53e0952da8
+  metadata.gz: 3df64fcf7bf38ee6e2e66c816279927a1fe6d9622a711c52b84a739745422e7c
+  data.tar.gz: dff1768c55cb33e57d01991ae91cad43ba752339c6f4db34582c06f9b0dfbf6e
 SHA512:
-  metadata.gz: 443b59cb242dc22e0d7ec6e711aefc2274452b5ea19d04af73db8250683f27da15b731af24b137213d91ea1f9c91873e7c5b85302c461c3f312b5d19e4bed2b7
-  data.tar.gz: 3e1d99bb86d51e2e589621e73ad763de5928e19aa1a15d470fa7adc616a749674df69356b8bd431d07804a8f5925bcb8742c98a560e99f6ff35abf2f423c439e
+  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,30 +1,42 @@
 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:
-          - '2.7'
-          - '3.0'
-          - '3.1'
-          - '3.2'
+        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@v3
+    - uses: actions/checkout@v7
     - uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
     - name: unit testing
       env:
         CI: true
       run: |
-        gem install bundler rake
-        bundle install --jobs 4 --retry 3
         bundle exec rake spec

data/.gitignore

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

data/ChangeLog

@@ -1,3 +1,14 @@
+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)
+  * gemspec: add logger gem as runtime dependency
+
 Release 0.9.1 - 2023/12/20
 
   * Fix invalid message polluting subsequent message

data/Gemfile

@@ -1,11 +1,12 @@
-
 source 'https://rubygems.org/'
 
-gem "fluentd", :github => 'fluent/fluentd'
-
 gemspec
 
-gem "simplecov", :require => false
+gem "rake", ">= 0.9.2"
+gem "rspec", ">= 3.0.0"
+gem "rspec-its", ">= 1.1.0"
+gem "timecop", ">= 0.3.0"
+gem "fluentd"
+gem "test-unit"
+gem "simplecov", ">= 0.5.4", require: false
 gem "simplecov-vim"
-
-gem 'test-unit'

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/README.md

@@ -148,6 +148,10 @@ Use nonblocking write(`IO#write_nonblock`) instead of normal write(`IO#write`).
 
 If `false`, `Logger#post` raises an error when nonblocking write gets `EAGAIN` (i.e. `use_nonblock` must be `true`, otherwise this will have no effect).  Default: `true`
 
+#### timeout (Integer)
+
+Specify a timeout in seconds for connecting. Default: `0` (Disabled)
+
 #### buffer_overflow_handler (Proc)
 
 Pass callback for handling buffer overflow with pending data. See "Buffer overflow" section.

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) }
@@ -22,10 +26,6 @@ Gem::Specification.new do |gem|
   gem.license       = "Apache-2.0"
 
   gem.add_dependency "msgpack", ">= 1.0.0", "< 2"
-  gem.add_development_dependency 'rake', '>= 0.9.2'
-  gem.add_development_dependency 'rspec', '>= 3.0.0'
-  gem.add_development_dependency 'rspec-its', '>= 1.1.0'
-  gem.add_development_dependency 'simplecov', '>= 0.5.4'
-  gem.add_development_dependency 'timecop', '>= 0.3.0'
-  gem.add_development_dependency 'webrick'
+  # logger gem that isn't default gems as of Ruby 3.5
+  gem.add_dependency "logger", "~> 1.6"
 end

data/lib/fluent/logger/fluent_logger.rb

@@ -22,6 +22,7 @@ require 'openssl'
 require 'monitor'
 require 'logger'
 require 'json'
+require 'timeout'
 
 module Fluent
   module Logger
@@ -48,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
@@ -115,6 +124,8 @@ module Fluent
         @wait_writeable = true
         @wait_writeable = options[:wait_writeable] if options.key?(:wait_writeable)
 
+        @timeout = options[:timeout] || 0
+
         @last_error = {}
 
         begin
@@ -170,7 +181,9 @@ module Fluent
         if @socket_path
           @con = UNIXSocket.new(@socket_path)
         else
-          @con = TCPSocket.new(@host, @port)
+          @con = Timeout.timeout(@timeout) do
+            TCPSocket.new(@host, @port)
+          end
           if @tls_options
             context = OpenSSL::SSL::SSLContext.new
             if @tls_options[:insecure]
@@ -230,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.9.1'
+    VERSION = '0.11.0'
   end
 end

data/spec/fluent_logger_spec.rb

@@ -6,6 +6,12 @@ require 'support/dummy_fluentd'
 require 'logger'
 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) {
@@ -175,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
       }
@@ -187,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'
@@ -198,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
@@ -434,4 +455,13 @@ describe Fluent::Logger::FluentLogger do
       }
     end
   end
+
+  it ('support timeout') {
+    Timeout::timeout(5) do
+      # Use invalid IP address to make sure that the connection will timeout.
+      # (192.0.2.0 is a special IP address that can be used in only documentation. Ref. RFC 5737)
+      logger = Fluent::Logger::FluentLogger.new(nil, host: '192.0.2.0', port: fluentd.port, timeout: 1)
+      expect(logger.last_error).to be_a_kind_of(Timeout::Error)
+    end
+  }
 end

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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -31,89 +30,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.9.2
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.0
-- !ruby/object:Gem::Dependency
-  name: rspec-its
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.1.0
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.5.4
-- !ruby/object:Gem::Dependency
-  name: timecop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: webrick
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
 description: fluent logger for ruby
 email: frsyuki@gmail.com
 executables:
@@ -121,6 +50,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/dependabot.yml"
 - ".github/workflows/linux.yml"
 - ".gitignore"
 - ".rspec"
@@ -146,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
@@ -159,8 +91,10 @@ files:
 homepage: https://github.com/fluent/fluent-logger-ruby
 licenses:
 - Apache-2.0
-metadata: {}
-post_install_message: 
+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
@@ -175,8 +109,21 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.1
-signing_key: 
+rubygems_version: 4.0.18
 specification_version: 4
 summary: fluent logger for ruby
-test_files: []
+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
+- spec/null_logger_spec.rb
+- spec/plugin/out_test.rb
+- spec/spec_helper.rb
+- spec/support/dummy_fluentd.rb
+- spec/support/dummy_serverengine.rb
+- spec/support/timecop.rb
+- spec/test_logger_spec.rb