td-logger 0.3.27 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08d8cffdf42dc7bbe14a546690db23f087541ee4'
-  data.tar.gz: 8e02136f8e6a1d9bcfb6b46add461063d7fd5d38
+SHA256:
+  metadata.gz: 3509dc779f96051e1170ff12bf6daea73c97a036aed00fbd7f1ccca8c0cd772d
+  data.tar.gz: cca38604bf79e9fd0132bdd225e0b97a198d47a6413aef80a01b3b5b88a70955
 SHA512:
-  metadata.gz: 261a948beb97dc79302b826b3f08e8d3f5fbe180772215efac1f6f14f32415d9fee889303a8d78ea83f160d45a70b6f868e7026e1153bdc8c22cbb10d751457f
-  data.tar.gz: 6e7eebe6033a0ee5b0519eb184b8e8b2d097c61ca4d14fe4059f2e19957e83ffeb901fef11a982cc60a7595ff38596435376f33c88db331d975cb1ea5dc1ecd9
+  metadata.gz: 2a417ee2218848ba7273693dedee44976c5f90282801fdcb091f15f6f9ec3013553c7bdd06f77fb948f65f3f3683a87a09dc072e6216962a32a23ffe2b78473c
+  data.tar.gz: c46d6e0cea7a883399a213d0e6ffb725c83759692e5193fb9c4716da51446ac02935ff700b475842f3e78768950bcd6347460ba569b3a213b0b2872f387deda0

data/ChangeLog

@@ -1,3 +1,15 @@
+== 2025-04-14 version 0.4.0
+
+* Require Ruby 2.7 or higher. Support for versions earlier than 2.7 has been removed.
+* Require td-client v1.0.8+
+* Allow td-client v2.x
+* Add mutex_m gem for Ruby 3.3+
+* Add logger gem
+
+== 2022-06-23 version 0.3.28
+
+* Support Ruby 3.1 (psych 4.0): Allow loading configuration files (tresure_data.yml) which have YAML aliases.
+
 == 2017-04-26 version 0.3.27
 
 * Allow td-client v1.x

data/SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+## Reporting a Vulnerability
+
+Treasure Data values the security of its customers and is committed to ensuring that the systems and products are secure. We invite all bug bounty researchers to join our efforts in identifying and reporting vulnerabilities in our systems.
+
+Submit your findings to our dedicated bug bounty email address [vulnerabilities@treasuredata.com](mailto:vulnerabilities@treasuredata.com) and help us keep Treasure Data secure. Let’s work together to make the Internet a safer place!

data/VERSION

@@ -1 +1 @@
-0.3.27
+0.4.0

data/lib/td/logger/agent/rails/config.rb

@@ -121,12 +121,12 @@ module Agent::Rails
     end
 
     def load_yaml(path)
-      require 'yaml'
+      require 'td/logger/agent/rails/yaml'
       require 'erb'
 
       src = File.read(path)
       yaml = ERB.new(src).result
-      YAML.load(yaml)
+      YAML.unsafe_load(yaml)
     end
   end
 

data/lib/td/logger/agent/rails/yaml.rb

@@ -0,0 +1,8 @@
+require 'yaml'
+
+unless YAML.respond_to?(:unsafe_load)
+  # Ruby < 2.6
+  class << YAML
+    alias unsafe_load load
+  end
+end

data/lib/td/logger/td_logger.rb

@@ -29,6 +29,7 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
     require 'cgi'
     require 'logger'
     require 'td-client'
+    require 'mutex_m'
 
     @logger = ::Logger.new(STDERR)
     if debug

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.27'
+VERSION = '0.4.0'
 
 end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.27
+  version: 0.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
-bindir: bin
+autorequire:
+bindir: exe
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2025-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.66
+        version: 1.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.8.66
+        version: 1.0.8
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
@@ -70,6 +70,40 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
+- !ruby/object:Gem::Dependency
+  name: mutex_m
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.2.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: logger
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -127,20 +161,15 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Treasure Data logging library
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".gitignore"
-- ".travis.yml"
 - ChangeLog
-- Gemfile
 - README.rdoc
-- Rakefile
+- SECURITY.md
 - VERSION
-- appveyor.yml
 - config/heroku/treasure_data.yml
 - lib/td-logger.rb
 - lib/td/logger.rb
@@ -149,21 +178,15 @@ files:
 - lib/td/logger/agent/rails/config.rb
 - lib/td/logger/agent/rails/controller.rb
 - lib/td/logger/agent/rails/model.rb
+- lib/td/logger/agent/rails/yaml.rb
 - lib/td/logger/event.rb
 - lib/td/logger/td_logger.rb
 - lib/td/logger/version.rb
-- spec/spec_helper.rb
-- spec/td/logger/agent/config_spec.rb
-- spec/td/logger/agent/rack_spec.rb
-- spec/td/logger/agent/rails_spec.rb
-- spec/td/logger/event_spec.rb
-- spec/td/logger/treasure_data_logger_spec.rb
-- spec/td/logger_spec.rb
-- td-logger.gemspec
-homepage: 
-licenses: []
+homepage:
+licenses:
+- Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -171,23 +194,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
-signing_key: 
+rubygems_version: 3.3.26
+signing_key:
 specification_version: 4
 summary: Treasure Data logging library
-test_files:
-- spec/spec_helper.rb
-- spec/td/logger/agent/config_spec.rb
-- spec/td/logger/agent/rack_spec.rb
-- spec/td/logger/agent/rails_spec.rb
-- spec/td/logger/event_spec.rb
-- spec/td/logger/treasure_data_logger_spec.rb
-- spec/td/logger_spec.rb
+test_files: []

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci

data/.gitignore

@@ -1,4 +0,0 @@
-Gemfile.lock
-pkg/*
-spec/tmp/
-coverage/

data/.travis.yml

@@ -1,29 +0,0 @@
-language: ruby
-
-rvm:
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.5
-  - 2.3.1
-  - 2.4.1
-  - ruby-head
-  - jruby-9.1.5.0
-
-sudo: false
-
-branches:
-  only:
-    - master
-
-gemfile:
-  - Gemfile
-
-script: bundle exec rake spec
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: jruby-9.1.5.0
-
-notifications:
-  webhooks: http://td-beda.herokuapp.com/travisci_callback

data/Gemfile

@@ -1,3 +0,0 @@
-source 'https://rubygems.org/'
-
-gemspec

data/Rakefile

@@ -1,13 +0,0 @@
-
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
-require 'rspec/core'
-require 'rspec/core/rake_task'
-
-RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
-end
-
-task :default => :build
-

data/appveyor.yml

@@ -1,17 +0,0 @@
----
-version: "{build}"
-clone_depth: 10
-install:
-  - SET PATH=C:\Ruby%ruby_version%\bin;%PATH%
-  - ruby --version
-  - gem --version
-  - gem install bundler --quiet --no-ri --no-rdoc
-  - bundler --version
-  - bundle install
-build_script:
-  - bundle exec rake build
-test_script:
-  - bundle exec rake spec
-environment:
-  matrix:
-    - ruby_version: "22"

data/spec/spec_helper.rb

@@ -1,29 +0,0 @@
-if defined?(:RUBY_ENGINE) && RUBY_ENGINE == 'ruby'
-  # SimpleCov officially supports MRI 1.9+ only for now
-  # https://github.com/colszowka/simplecov#ruby-version-compatibility
-
-  require 'simplecov'
-  unless ENV['APPVEYOR']
-    require 'coveralls'
-
-    SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
-      SimpleCov::Formatter::HTMLFormatter,
-      Coveralls::SimpleCov::Formatter
-    ]
-  end
-  SimpleCov.start("test_frameworks")
-end
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-
-REPO_ROOT = Pathname.new(File.expand_path("../", __FILE__))
-
-require 'td-logger'
-
-RSpec.configure do |config|
-  #config.filter_run :focus => true
-  config.run_all_when_everything_filtered = true
-
-  config.mock_with :rspec
-end

data/spec/td/logger/agent/config_spec.rb

@@ -1,260 +0,0 @@
-require 'spec_helper'
-require 'fileutils'
-require 'logger'
-
-TMP_DIR = REPO_ROOT.join("tmp")
-FileUtils.rm_rf(TMP_DIR)
-
-class Rails
-  def self.configuration
-    self.new
-  end
-
-  def self.logger
-    Logger.new(STDOUT)
-  end
-
-  def self.root
-    TMP_DIR
-  end
-
-  def self.env
-    "test"
-  end
-
-  def middleware
-    self
-  end
-
-  def use(mod)
-  end
-end
-
-class ActionController
-  class Base
-  end
-end
-
-class ActiveSupport
-  class TimeWithZone
-  end
-end
-
-require 'td/logger/agent/rails' # NOTE: should be require after Rails goodies mocked
-
-
-describe TreasureData::Logger::Agent::Rails::Config do
-  before(:each) do
-    FileUtils.rm_rf(TMP_DIR)
-    FileUtils.mkdir_p(TMP_DIR)
-    ENV.delete('TREASURE_DATA_API_KEY')
-    ENV.delete('TREASURE_DATA_DB')
-  end
-
-  context 'init' do
-    it 'load_env' do
-      ENV['TREASURE_DATA_API_KEY'] = 'test1'
-      ENV['TREASURE_DATA_DB'] = 'db1'
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.agent_mode?).to eq(false)
-      expect(c.apikey).to eq('test1')
-      expect(c.database).to eq('db1')
-      expect(c.auto_create_table).to eq(true)
-    end
-
-    it 'load_file' do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-test:
-  apikey: test2
-  database: db2
-  debug_mode: true
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.agent_mode?).to eq(false)
-      expect(c.apikey).to eq('test2')
-      expect(c.database).to eq('db2')
-      expect(c.auto_create_table).to eq(true)
-      expect(c.debug_mode).to eq(true)
-      expect(c.access_log_enabled?).to eq false
-    end
-
-    it 'load_file without test' do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-development:
-  apikey: test2
-  database: db2
-  debug_mode: true
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(true)
-      expect(c.access_log_enabled?).to eq false
-    end
-
-    it 'prefer file than env' do
-      ENV['TREASURE_DATA_API_KEY'] = 'test3'
-      ENV['TREASURE_DATA_DB'] = 'db3'
-
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-test:
-  apikey: test4
-  database: db4
-  auto_create_table: false
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.agent_mode?).to eq(false)
-      expect(c.apikey).to eq('test4')
-      expect(c.database).to eq('db4')
-      expect(c.auto_create_table).to eq(false)
-      expect(c.debug_mode).to eq(false)
-      expect(c.access_log_enabled?).to eq false
-    end
-
-    it 'agent mode' do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-test:
-  agent: localhost
-  tag: td.db5
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.agent_mode?).to eq(true)
-      expect(c.tag).to eq('td.db5')
-      expect(c.agent_host).to eq('localhost')
-      expect(c.agent_port).to eq(24224)
-      expect(c.access_log_enabled?).to eq false
-    end
-
-    it 'test mode' do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-test:
-  agent: localhost
-  tag: td.db5
-  test_mode: true
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.test_mode?).to eq(true)
-      expect(c.access_log_enabled?).to eq false
-    end
-
-    it "access_log_enabled" do
-      FileUtils.mkdir_p("#{TMP_DIR}/config")
-      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-        f.write <<EOF
-test:
-  agent: localhost
-  tag: foo.bar
-  access_log_table: log
-EOF
-      }
-      c = TreasureData::Logger::Agent::Rails::Config.init
-      expect(c.disabled).to eq(false)
-      expect(c.access_log_enabled?).to eq true
-    end
-
-    describe "load_file_ey" do
-      context "config_path does not exists" do
-        it "load from CONFIG_PATH_EY_DEPLOY" do
-          FileUtils.mkdir_p("#{TMP_DIR}/config")
-          File.unlink("#{TMP_DIR}/config/treasure_data.yml") rescue nil
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_DEPLOY, "w") {|f|
-            f.write <<EOF
-td:
-  TREASURE_DATA_API_KEY: foo
-EOF
-          }
-          c = TreasureData::Logger::Agent::Rails::Config.init
-          expect(c.disabled).to eq(false)
-        end
-
-        it "disabled true if td.TREASURE_DATA_API_KEY missing" do
-          FileUtils.mkdir_p("#{TMP_DIR}/config")
-          File.unlink("#{TMP_DIR}/config/treasure_data.yml") rescue nil
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_DEPLOY, "w") {|f|
-            f.write <<EOF
-EOF
-          }
-          c = TreasureData::Logger::Agent::Rails::Config.init
-          expect(c.disabled).to eq(true)
-        end
-      end
-
-      context "config_path and CONFIG_PATH_EY_DEPLOY does not exists" do
-        it "load from CONFIG_PATH_EY_LOCAL" do
-          FileUtils.mkdir_p("#{TMP_DIR}/config")
-          File.unlink("#{TMP_DIR}/config/treasure_data.yml") rescue nil
-          File.unlink(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_DEPLOY) rescue nil
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_LOCAL, "w") {|f|
-            f.write <<EOF
-td:
-  TREASURE_DATA_API_KEY: foo
-EOF
-          }
-          c = TreasureData::Logger::Agent::Rails::Config.init
-          expect(c.disabled).to eq(false)
-        end
-
-        it "disabled true if td.TREASURE_DATA_API_KEY missing" do
-          FileUtils.mkdir_p("#{TMP_DIR}/config")
-          File.unlink("#{TMP_DIR}/config/treasure_data.yml") rescue nil
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_LOCAL, "w") {|f|
-            f.write <<EOF
-EOF
-          }
-          c = TreasureData::Logger::Agent::Rails::Config.init
-          expect(c.disabled).to eq(true)
-        end
-      end
-
-      context "config_path, CONFIG_PATH_EY_DEPLOY, CONFIG_PATH_EY_LOCAL are all exists" do
-        it "load from CONFIG_PATH_EY_LOCAL" do
-          FileUtils.mkdir_p("#{TMP_DIR}/config")
-          File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
-            f.write <<EOF
-test:
-  agent: localhost
-  tag: foo.bar
-  test_mode: false
-EOF
-          }
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_DEPLOY, "w") {|f|
-            f.write <<EOF
-test:
-  agent: localhost
-  tag: foo.bar
-  test_mode: true
-EOF
-          }
-          File.open(TreasureData::Logger::Agent::Rails::CONFIG_PATH_EY_LOCAL, "w") {|f|
-            f.write <<EOF
-test:
-  agent: localhost
-  tag: foo.bar
-  test_mode: true
-EOF
-          }
-          c = TreasureData::Logger::Agent::Rails::Config.init
-          expect(c.test_mode).to eq(false)
-        end
-      end
-    end
-  end
-end

data/spec/td/logger/agent/rack_spec.rb

@@ -1,37 +0,0 @@
-require 'spec_helper'
-require "rack/mock"
-require 'td/logger/agent/rack'
-
-describe TreasureData::Logger::Agent::Rack::Hook do
-  def app
-    @app ||= Rack::Builder.new {
-      use TreasureData::Logger::Agent::Rack::Hook
-      run lambda {|env| [200, {}, ["body"]]}
-    }.to_app
-  end
-
-  let(:dummy_object) { double.as_null_object }
-
-  subject { Rack::MockRequest.new(app).get("/") }
-
-  describe ".before" do
-    it do
-      TreasureData::Logger::Agent::Rack::Hook.before do |env|
-        dummy_object.called_at_before!(env)
-      end
-      expect(subject.status).to eq 200
-      expect(dummy_object).to have_received(:called_at_before!).once
-    end
-  end
-
-  describe ".after" do
-    it do
-      TreasureData::Logger::Agent::Rack::Hook.after do |env, result|
-        dummy_object.called_at_after!
-        result[0] = 201
-      end
-      expect(subject.status).to eq 201
-      expect(dummy_object).to have_received(:called_at_after!).once
-    end
-  end
-end