td-logger 0.3.25 → 0.3.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 95a36a6c7cb7b469128717a154baa2a4c4ea556a
-  data.tar.gz: 91edda08bbf14f498394ae9ddf8154b7be25b3ee
+SHA256:
+  metadata.gz: c8d82284d5c496c5a78ebe21849f7460505b14b16017b059559dcbbcae6da0be
+  data.tar.gz: 4659ee78358501bd3d79ba75938668b5c854fcc333e92c5194f0675b87cc38a4
 SHA512:
-  metadata.gz: d2344c5248eaaee17ad48f126b64083bc984fb347c2a0544480f90ec74251aa4fedb5a5fe5b5a724bbf2915df8c6898cb2753421552ace7431cbafdb30e3d85a
-  data.tar.gz: a4fa052a3af4160b1c531648a3b7ac63bb4992bdde711966c1d396ff5ff823276f0a59ae9c5b68fdcaef8141873b64227b5132964aa94a649342dca09e387182
+  metadata.gz: '08b999bb71891b3b4474693b3ec0954a9d71308b497d130dfa85e8f5e31a927cd57bdada7c32c73d4042d6132ffc872b0a4279bb867487bf8cc2b5cd91fae8df'
+  data.tar.gz: 46f0313dde88022116aff652481a7acb266d8e7cc53053c48cae0c31fc4fad6769aa9ad8618ecff79f5e112296059a4750a3b38ddaae46beb4d3d0b8a4e480b3

data/.github/workflows/ci.yml

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,70 @@
+# 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/ChangeLog

@@ -1,3 +1,17 @@
+== 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
+
+
+== 2016-10-19 version 0.3.26
+
+* Allow msgpack v1.x
+
+
 == 2016-01-19 version 0.3.25
 
 * can use unique_key when post td

data/README.rdoc

@@ -67,7 +67,7 @@ Please note that we recommend to use a write-only API key. To obtain one, please
 
 When the 'agent' and 'tag' options are specified, the events are logged into the local td-agent daemon. Later on, the daemon uploads the event periodically to the cloud (app -> td-agent -> cloud).
 
-This requires additional setup steps but lowers the memory and performance impact to your application processes. For the installation process, please look at our {knowledge base}[http://help.treasuredata.com/customer/portal/topics/550539-installing-td-agent/articles] page.
+This requires additional setup steps but lowers the memory and performance impact to your application processes. For the installation process, please look at the section {"How to Install Treasure Agent?"}[https://docs.treasuredata.com/articles/td-agent#how-to-install-treasure-agent] on "Quickstart Guide".
 
 NOTE: This configuration is not supported on PaaS platforms.
 
@@ -75,7 +75,15 @@ NOTE: This configuration is not supported on PaaS platforms.
       agent: "localhost:24224"
       tag: td.myapp
       debug_mode: false
-      
+
+Alternatively, one can initialize the Ruby Logger module for indirect upload within the application:
+
+    TreasureData::Logger.open_agent('td.myapp',
+                                    :host => 'localhost',
+                                    :port => 24224)
+
+The arguments of the 'open_agent' function correspond to the configuration option of the underlying {Fluentd Ruby Logger (fluent-logger-ruby)}[https://github.com/fluent/fluent-logger-ruby/] library.
+
 == Logging events
 
 You can log anytime using 'TD.event.post' method:
@@ -118,8 +126,7 @@ You can access the logger instance via TD.logger to check the status.
 
 == Further Readings
 
-If you have any problem, please consult the knowledge based and ask us on the support site: 
-{Support Site}[http://help.treasure-data.com].
+If you have any problem, please refer our {document site}[https://docs.treasuredata.com/].
 
 == Copyright
 

data/VERSION

@@ -1 +1 @@
-0.3.25
+0.3.28

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/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.25'
+VERSION = '0.3.28'
 
 end
 end

data/spec/td/logger/treasure_data_logger_spec.rb

@@ -6,7 +6,7 @@ describe TreasureData::Logger::TreasureDataLogger do
     it 'with apikey' do
       td = TreasureData::Logger::TreasureDataLogger.new('db1', :apikey => 'test_1')
       expect(td.instance_variable_get(:@client).api.apikey).to eq('test_1')
-      expect(td.instance_variable_get(:@client).api.instance_variable_get(:@ssl)).to eq(false)
+      expect(td.instance_variable_get(:@client).api.instance_variable_get(:@ssl)).to eq(true)
     end
 
     it 'with apikey and use_ssl' do

data/td-logger.gemspec

@@ -24,17 +24,23 @@ EOF
   #gem.homepage    = %q{https://github.com/treasure-data/td-logger-ruby}
   gem.description = %q{Treasure Data logging library}
   gem.summary     = gem.description
+  gem.licenses    = ["Apache-2.0"]
 
   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) }
   gem.require_paths = ['lib']
 
-  gem.add_dependency "msgpack", [">= 0.4.4", "!= 0.5.0", "!= 0.5.1", "!= 0.5.2", "!= 0.5.3", "< 0.8.0"]
-  gem.add_dependency "td-client", "~> 0.8.66"
-  gem.add_dependency "fluent-logger", "~> 0.5.0"
+  gem.add_dependency "msgpack", ">= 0.5.6", "< 2.0"
+  gem.add_dependency "td-client", ">= 0.8.66", "< 2.0"
+  gem.add_dependency "fluent-logger", ">= 0.5.0", "< 2.0"
   gem.add_development_dependency 'rake', '>= 0.9.2'
   gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'coveralls'
-  gem.add_development_dependency 'rack'
+  ruby_version = Gem::Version.new(RUBY_VERSION)
+  if ruby_version >= Gem::Version.new('2.2.2')
+    gem.add_development_dependency 'rack'
+  else
+    gem.add_development_dependency 'rack', '~> 1.0'
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.25
+  version: 0.3.28
 platform: ruby
 authors:
 - Sadayuki Furuhashi
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-01-19 00:00:00.000000000 Z
+date: 2022-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -16,72 +16,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.4
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.0
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.1
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.2
-    - - "!="
-      - !ruby/object:Gem::Version
-        version: 0.5.3
+        version: 0.5.6
     - - "<"
       - !ruby/object:Gem::Version
-        version: 0.8.0
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: td-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.66
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.66
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fluent-logger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.5.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -139,20 +127,20 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Treasure Data logging library
-email: 
+email:
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".coveralls.yml"
+- ".github/workflows/ci.yml"
+- ".github/workflows/codeql-analysis.yml"
 - ".gitignore"
-- ".travis.yml"
 - ChangeLog
 - Gemfile
 - README.rdoc
 - Rakefile
 - VERSION
-- appveyor.yml
 - config/heroku/treasure_data.yml
 - lib/td-logger.rb
 - lib/td/logger.rb
@@ -161,6 +149,7 @@ 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
@@ -172,10 +161,11 @@ files:
 - 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
@@ -190,9 +180,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.1
-signing_key: 
+rubygems_version: 3.3.7
+signing_key:
 specification_version: 4
 summary: Treasure Data logging library
 test_files:

data/.travis.yml

@@ -1,31 +0,0 @@
-language: ruby
-
-rvm:
-  - 1.9.3
-  - 2.0.0
-  - 2.1
-  - 2.2
-  - 2.3.0
-  - ruby-head
-  - rbx
-  - jruby-1.7.20
-
-sudo: false
-
-branches:
-  only:
-    - master
-
-gemfile:
-  - Gemfile
-
-script: bundle exec rake spec
-
-matrix:
-  allow_failures:
-    - rvm: ruby-head
-    - rvm: rbx
-    - rvm: jruby-1.7.20
-
-notifications:
-  webhooks: http://td-beda.herokuapp.com/travisci_callback

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"