docker-fluent-logger 0.0.10 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 78a120cf564ddd0b8b682d4b2ec1390bcfc95d54
-  data.tar.gz: 6fafdb4d8076eda1c0d57021088ae5bde511e2d7
+SHA256:
+  metadata.gz: d75b10f08411a0ff4b639e9cd62675d808c5b7cb7d9cdcffbdfd4d14c8edca14
+  data.tar.gz: 359a0731f0e7e10ff2bef3d494d85b140fdc1868dc29bc5b14b727391c2f6e85
 SHA512:
-  metadata.gz: edef93281c81b21eb8c6fca879e1ec46c9920abcb594290e7c04f90aa149440fb02de671920e13ec77fd376264336f1a167fd616695b8306c30a118a06093828
-  data.tar.gz: 5432825fef647d4b99246ac65ffbf2e307056523a7f79dee7416dd6c77e41dc3de443b16d791ba653fa7ab8220e6504b944b85f72d70560ad872210bbc0bb68a
+  metadata.gz: 8a056f64483a7d1a7de90cac9bb1238adf7c88365abc0447a3a77b97d415f7b2961ee0a70f3d8bea7fbcdf2bf1efeae35cded48e78a5530ce2e477683bb07e1f
+  data.tar.gz: 642a190c7cbe6db42e392168d3a33612163604beed0db854fa8e81452f08d8cb959d93300e74fe4e42df20ef9b3662aca11ae18a6769317e8ba617ad3f3967d4

data/.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

data/.gitignore

@@ -1,11 +1,3 @@
-/.bundle/
-/.yardoc
-/Gemfile.lock
-/_yardoc/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
+.DS_Store
+pkg
+vendor

data/Gemfile.lock

@@ -0,0 +1,115 @@
+PATH
+  remote: .
+  specs:
+    docker-fluent-logger (1.0.0)
+      activesupport (>= 5.0.0)
+      lograge (~> 0.5)
+      oj (~> 3.10.0)
+      thor (~> 0.19)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actionpack (6.0.1)
+      actionview (= 6.0.1)
+      activesupport (= 6.0.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actionview (6.0.1)
+      activesupport (= 6.0.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (6.0.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+      zeitwerk (~> 2.2)
+    ast (2.4.0)
+    builder (3.2.3)
+    concurrent-ruby (1.1.5)
+    crass (1.0.5)
+    diff-lcs (1.3)
+    erubi (1.9.0)
+    i18n (1.7.0)
+      concurrent-ruby (~> 1.0)
+    jaro_winkler (1.5.4)
+    lograge (0.11.2)
+      actionpack (>= 4)
+      activesupport (>= 4)
+      railties (>= 4)
+      request_store (~> 1.0)
+    loofah (2.4.0)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    method_source (0.9.2)
+    mini_portile2 (2.4.0)
+    minitest (5.13.0)
+    nokogiri (1.10.7)
+      mini_portile2 (~> 2.4.0)
+    oj (3.10.0)
+    parallel (1.19.1)
+    parser (2.6.5.0)
+      ast (~> 2.4.0)
+    rack (2.0.7)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.0.1)
+      actionpack (= 6.0.1)
+      activesupport (= 6.0.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.20.3, < 2.0)
+    rainbow (3.0.0)
+    rake (10.5.0)
+    request_store (1.4.1)
+      rack (>= 1.4)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.0)
+      rspec-support (~> 3.9.0)
+    rspec-expectations (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.0)
+    rubocop (0.77.0)
+      jaro_winkler (~> 1.5.1)
+      parallel (~> 1.10)
+      parser (>= 2.6)
+      rainbow (>= 2.2.2, < 4.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    ruby-progressbar (1.10.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    unicode-display_width (1.6.0)
+    zeitwerk (2.2.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.14)
+  docker-fluent-logger!
+  rake (~> 10.0)
+  rspec (~> 3.0)
+  rubocop (~> 0.48)
+
+BUNDLED WITH
+   1.17.2

data/README.md

@@ -1,6 +1,48 @@
 # DockerFluentLogger
 
-@TODO
+Output Rails log to JSON format.
+
+## e.g.
+
+HTTP request outputs following log to STDOUT.
+
+```
+{
+  "method": "GET",
+  "path": "/",
+  "format": "html",
+  "controller": "IndexController",
+  "action": "index",
+  "status": 403,
+  "duration": 428.27,
+  "view": 0.29,
+  "db": 0.0,
+  "timestamp": "2019-12-11T12:21:00.050200Z",
+  "hostname": "f78a33527a16",
+  "uuid": "a4ecff04-d6d9-4477-8746-0b78ccae0e13",
+  "url": "http://localhost:3000/",
+  "remote_ip": "172.29.0.1",
+  "referer": null,
+  "user_agent": "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/78.0.3904.108 Safari/537.36"
+}
+```
+
+Rails logger also output logs in JSON as well.
+
+```
+logger.info('example')
+# Or
+DockerFluentLogger.create.info('example')
+```
+
+Following log is output.
+```
+{
+  "severity": "INFO",
+  "timestamp": "2019-12-11T12:19:01.599089Z",
+  "message": "example"
+}
+```
 
 ## Installation
 
@@ -47,17 +89,7 @@ end
 Add following code to `config/environments/***.rb`.
 
 ```ruby
-if ENV['RAILS_LOG_TO_STDOUT'].present?
-  config.logger = DockerFluentLogger.create
-end
-```
-
-When using [ECS Deployer](https://github.com/naomichi-y/ecs_deployer), Add `RAILS_LOG_TO_STDOUT` variable to `config/deploy/***.yml`.
-
-```yaml
-environment:
-  - name: RAILS_LOG_TO_STDOUT
-    value: enabled
+config.logger = DockerFluentLogger.create
 ```
 
 ## License

data/docker-fluent-logger.gemspec

@@ -31,11 +31,10 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'thor', '~> 0.19'
-  spec.add_dependency 'lograge', '~> 0.5'
-  spec.add_dependency 'logstash-logger', '~> 0.24'
-  spec.add_dependency 'logstash-event', '~> 1.2'
   spec.add_dependency 'activesupport', '>= 5.0.0'
+  spec.add_dependency 'lograge', '~> 0.5'
+  spec.add_dependency 'oj', '~> 3.10.0'
+  spec.add_dependency 'thor', '~> 0.19'
 
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'rake', '~> 10.0'

data/example/sample.rb

@@ -1,4 +1,5 @@
 require 'bundler/setup'
 require 'docker-fluent-logger'
 
-DockerFluentLogger.create
+logger = DockerFluentLogger.create
+logger.info('example');

data/lib/docker-fluent-logger.rb

@@ -1,4 +1,6 @@
-require 'logstash-logger'
+require 'json'
+require 'logger'
+require 'oj'
 
 require 'docker-fluent-logger/cli'
 require 'docker-fluent-logger/payload'
@@ -6,6 +8,18 @@ require 'docker-fluent-logger/version'
 
 module DockerFluentLogger
   def self.create
-    LogStashLogger.new(type: :stdout)
+    logger = Logger.new(STDOUT)
+
+    logger.formatter = proc do |severity, datetime, progname, message|
+      data = {
+        severity: severity,
+        timestamp: datetime.utc.iso8601(6),
+        message: message
+      }
+      data[:progname] = progname unless progname.nil?
+      "#{Oj.dump(data, mode: :compat)}\n"
+    end
+
+    logger
   end
 end

data/lib/docker-fluent-logger/cli.rb

@@ -2,11 +2,10 @@ require 'thor'
 
 module DockerFluentLogger
   class CLI < Thor
-    desc 'install', 'Setup programs'
+    desc 'install', 'Install file'
     def install
       current_dir = Pathname(File.dirname(__FILE__))
 
-      # lograte.rb
       src_path = current_dir.join('generator', 'templates', 'lograge.rb')
       dest_path = Pathname('config').join('initializers', 'lograge.rb')
 

data/lib/docker-fluent-logger/generator/templates/lograge.rb

@@ -4,11 +4,12 @@ Rails.application.configure do
   config.lograge.logger = ActiveSupport::Logger.new(STDOUT)
   config.lograge.enabled = true
   config.lograge.keep_original_rails_log = false
-  config.lograge.formatter = Lograge::Formatters::Logstash.new
+  config.lograge.formatter = Lograge::Formatters::Json.new
 
   config.lograge.custom_options = lambda do |event|
     data = {
-      hostname: Socket.gethostname,
+      timestamp: event.payload[:timestamp],
+      hostname: event.payload[:hostname],
       uuid: event.payload[:uuid],
       url: event.payload[:url],
       remote_ip: event.payload[:remote_ip],

data/lib/docker-fluent-logger/payload.rb

@@ -8,7 +8,8 @@ module DockerFluentLogger
     def append_info_to_payload(payload)
       super
 
-      payload[:@timestamp] = Time.now.utc
+      payload[:timestamp] = Time.now.utc.iso8601(6)
+      payload[:hostname] = Socket.gethostname
       payload[:uuid] = request.uuid
       payload[:url] = request.url
       payload[:referer]  = request.referer

data/lib/docker-fluent-logger/version.rb

@@ -1,3 +1,3 @@
 module DockerFluentLogger
-  VERSION = '0.0.10'.freeze
+  VERSION = '1.0.0'.freeze
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: docker-fluent-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 1.0.0
 platform: ruby
 authors:
 - naomichi-y
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-30 00:00:00.000000000 Z
+date: 2019-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.19'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: lograge
   requirement: !ruby/object:Gem::Requirement
@@ -39,47 +39,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.5'
 - !ruby/object:Gem::Dependency
-  name: logstash-logger
+  name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: 3.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.24'
+        version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: logstash-event
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '0.19'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '0.19'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,10 +130,12 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".bundle/config"
 - ".gitignore"
 - ".rspec"
 - ".rubocop.yml"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -158,7 +146,6 @@ files:
 - exe/docker-fluent-logger
 - lib/docker-fluent-logger.rb
 - lib/docker-fluent-logger/cli.rb
-- lib/docker-fluent-logger/generator/.DS_Store
 - lib/docker-fluent-logger/generator/templates/lograge.rb
 - lib/docker-fluent-logger/payload.rb
 - lib/docker-fluent-logger/version.rb
@@ -182,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Transfer docker log to Flutend