td-logger 0.3.28 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8d82284d5c496c5a78ebe21849f7460505b14b16017b059559dcbbcae6da0be
-  data.tar.gz: 4659ee78358501bd3d79ba75938668b5c854fcc333e92c5194f0675b87cc38a4
+  metadata.gz: 3509dc779f96051e1170ff12bf6daea73c97a036aed00fbd7f1ccca8c0cd772d
+  data.tar.gz: cca38604bf79e9fd0132bdd225e0b97a198d47a6413aef80a01b3b5b88a70955
 SHA512:
-  metadata.gz: '08b999bb71891b3b4474693b3ec0954a9d71308b497d130dfa85e8f5e31a927cd57bdada7c32c73d4042d6132ffc872b0a4279bb867487bf8cc2b5cd91fae8df'
-  data.tar.gz: 46f0313dde88022116aff652481a7acb266d8e7cc53053c48cae0c31fc4fad6769aa9ad8618ecff79f5e112296059a4750a3b38ddaae46beb4d3d0b8a4e480b3
+  metadata.gz: 2a417ee2218848ba7273693dedee44976c5f90282801fdcb091f15f6f9ec3013553c7bdd06f77fb948f65f3f3683a87a09dc072e6216962a32a23ffe2b78473c
+  data.tar.gz: c46d6e0cea7a883399a213d0e6ffb725c83759692e5193fb9c4716da51446ac02935ff700b475842f3e78768950bcd6347460ba569b3a213b0b2872f387deda0

data/ChangeLog

@@ -1,3 +1,11 @@
+== 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.

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.28
+0.4.0

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.28'
+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.28
+  version: 0.4.0
 platform: ruby
 authors:
 - Sadayuki Furuhashi
 autorequire:
-bindir: bin
+bindir: exe
 cert_chain: []
-date: 2022-06-23 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
@@ -132,14 +166,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
-- ".github/workflows/ci.yml"
-- ".github/workflows/codeql-analysis.yml"
-- ".gitignore"
 - ChangeLog
-- Gemfile
 - README.rdoc
-- Rakefile
+- SECURITY.md
 - VERSION
 - config/heroku/treasure_data.yml
 - lib/td-logger.rb
@@ -153,14 +182,6 @@ files:
 - 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:
 - Apache-2.0
@@ -173,22 +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: []
-rubygems_version: 3.3.7
+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/.github/workflows/ci.yml

@@ -1,44 +0,0 @@
-name: CI
-
-on:
-  push:
-
-jobs:
-  test:
-    runs-on: ${{ matrix.os }}
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-latest
-        ruby:
-          - 2.3.1
-          - 2.4.1
-          - 2.5.9
-          - 2.6.9
-          - 2.7.5
-          - 3.0.3
-          - 3.1.0
-          - head
-        # TODO: Add jruby
-        include:
-          - os: windows-latest
-            ruby: 2.7.5
-          - os: macos-latest
-            ruby: 2.7.5
-
-
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-
-      - name: Install dependencies
-        run: |
-          bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3
-
-      - name: Run tests
-        run: bundle exec rake spec

data/.github/workflows/codeql-analysis.yml

@@ -1,70 +0,0 @@
-# For most projects, this workflow file will not need changing; you simply need
-# to commit it to your repository.
-#
-# You may wish to alter this file to override the set of languages analyzed,
-# or to provide custom queries or build logic.
-#
-# ******** NOTE ********
-# We have attempted to detect the languages in your repository. Please check
-# the `language` matrix defined below to confirm you have the correct set of
-# supported CodeQL languages.
-#
-name: "CodeQL"
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ master ]
-  schedule:
-    - cron: '39 1 * * 6'
-
-jobs:
-  analyze:
-    name: Analyze
-    runs-on: ubuntu-latest
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    strategy:
-      fail-fast: false
-      matrix:
-        language: [ 'ruby' ]
-        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python', 'ruby' ]
-        # Learn more about CodeQL language support at https://git.io/codeql-language-support
-
-    steps:
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    # Initializes the CodeQL tools for scanning.
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
-      with:
-        languages: ${{ matrix.language }}
-        # If you wish to specify custom queries, you can do so here or in a config file.
-        # By default, queries listed here will override any specified in a config file.
-        # Prefix the list here with "+" to use these queries and those in the config file.
-        # queries: ./path/to/local/query, your-org/your-repo/queries@main
-
-    # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
-    # If this step fails, then you should remove it and run the build manually (see below)
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v1
-
-    # ℹ️ Command-line programs to run using the OS shell.
-    # 📚 https://git.io/JvXDl
-
-    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
-    #    and modify them (or add more) to build your code if your project
-    #    uses a compiled language
-
-    #- run: |
-    #   make bootstrap
-    #   make release
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1

data/.gitignore

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

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/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