fluent-plugin-light-core 0.2.2 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de6963e9c755b56d0c56eb2efe8d5144b66ea1463dd826c90ab71f5b65a72f37
-  data.tar.gz: f37743b84fc9a68940c488e06903a71725ffbb14a0a7a02c2203a19074f22940
+  metadata.gz: aa263e49f613865247d281b1bb9f5cd65df261da7047466a11c428d77742f4c2
+  data.tar.gz: 763f163046a38dca3a9341bfdcc36a18a1da34a9fa9bc78933983ba7c2c955ba
 SHA512:
-  metadata.gz: 2d3fb8390aaf781220b4e288819c1f14c063a50c58ea850ef8b55ae63005ed3db03653b7e81f6cf349cfac04ca5259c2a4e2c73ec83003ed8290fefe9e187c1b
-  data.tar.gz: b89a10c9a2581a781536e06f4b7285c066ef1ec73f4a033bd646c7c2759e9de00a2a5227a5afa98ec406737390fd37c2212086a4cf33ccd7cab3addac4ec4787
+  metadata.gz: ed1cb6b3a76b067dd3734bc9fa446211e6b4e3fbb2abf179327f18b47f88ca8c6dc5c5fe23711872b3a40fbd471bfe193363469fc10b37ffa63bb0329886ad15
+  data.tar.gz: 950534c7d8bc3c443eb442e6d3d6bcf0a81c0cd7c66f6ef94dc55122587ca2e31aecd9df4e4303133d51aeb041c1cdbdd60b904c12ba3054df2e9d408f834a95

data/.gitignore

@@ -1,2 +1,3 @@
 *.log
 *.pos
+*.gem

data/Gemfile

@@ -2,4 +2,6 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "sentry-ruby"
+gem "sentry-ruby"
+
+gem "oj", "~> 3.13"

data/Gemfile.lock

@@ -1,38 +1,71 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-light-core (0.1.0)
-      fluentd (>= 0.14.10, < 2)
+    fluent-plugin-light-core (0.2.3)
+      fluentd (>= 1.14.2, < 2)
+      sentry-ruby (>= 4.8.0, < 5)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cool.io (1.6.0)
-    fluentd (1.11.2)
+    concurrent-ruby (1.1.9)
+    cool.io (1.7.1)
+    faraday (1.8.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0.1)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.1)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      multipart-post (>= 1.2, < 3)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    fluentd (1.14.2)
+      bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.7.0)
+      http_parser.rb (>= 0.5.1, < 0.8.0)
       msgpack (>= 1.3.1, < 2.0.0)
-      serverengine (>= 2.0.4, < 3.0.0)
+      serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
-      strptime (>= 0.2.2, < 1.0.0)
+      strptime (>= 0.2.4, < 1.0.0)
       tzinfo (>= 1.0, < 3.0)
       tzinfo-data (~> 1.0)
+      webrick (>= 1.4.2, < 1.8.0)
       yajl-ruby (~> 1.0)
-    http_parser.rb (0.6.0)
-    msgpack (1.3.3)
+    http_parser.rb (0.7.0)
+    msgpack (1.4.2)
+    multipart-post (2.1.1)
+    oj (3.13.9)
     power_assert (1.1.3)
     rake (12.3.2)
-    serverengine (2.2.1)
+    ruby2_keywords (0.0.5)
+    sentry-ruby (4.8.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      faraday (>= 1.0)
+      sentry-ruby-core (= 4.8.0)
+    sentry-ruby-core (4.8.0)
+      concurrent-ruby
+      faraday
+    serverengine (2.2.4)
       sigdump (~> 0.2.2)
     sigdump (0.2.4)
-    strptime (0.2.4)
+    strptime (0.2.5)
     test-unit (3.2.9)
       power_assert
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    tzinfo-data (1.2020.1)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.5)
       tzinfo (>= 1.0.0)
+    webrick (1.7.0)
     yajl-ruby (1.4.1)
 
 PLATFORMS
@@ -41,7 +74,9 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.14)
   fluent-plugin-light-core!
+  oj (~> 3.13)
   rake (~> 12.0)
+  sentry-ruby
   test-unit (~> 3.0)
 
 BUNDLED WITH

data/fluent-plugin-light-core.gemspec

@@ -3,7 +3,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name    = "fluent-plugin-light-core"
-  spec.version = "0.2.2"
+  spec.version = "0.2.6"
   spec.authors = ["LIN LI"]
   spec.email   = ["l.li@alphabets.cn"]
 
@@ -23,6 +23,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.14"
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "test-unit", "~> 3.0"
-  spec.add_runtime_dependency "fluentd", [">= 0.14.10", "< 2"]
-  spec.add_runtime_dependency "sentry-ruby", [">= 4.1.5", "< 5"]
+  spec.add_runtime_dependency "fluentd", [">= 1.14.2", "< 2"]
+  spec.add_runtime_dependency "sentry-ruby", [">= 4.8.0", "< 5"]
+  spec.add_runtime_dependency "oj", [">= 3.13", "< 4"]
 end

data/lib/fluent/plugin/filter_light_core.rb

@@ -131,9 +131,9 @@ module Fluent
           record['method'] = item[:method]
           record['url'] = item[:url]
           record['status'] = item[:status]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['uid'] = item[:uid]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['addr'] = item[:addr].gsub(/\n$/, '')
 
           return record
@@ -170,10 +170,10 @@ module Fluent
           record['method'] = item[:method]
           record['path'] = item[:path]
           record['code'] = item[:code]
-          record['size'] = format_str(item[:size])
+          record['size'] = str_to_num(item[:size])
           record['referer'] = item[:referer]
           record['agent'] = item[:agent]
-          record['elapsed'] = format_str(item[:elapsed])
+          record['elapsed'] = str_to_num(item[:elapsed])
           record['requestid'] = item[:requestid]
           record['sessionid'] = item[:sessionid]
 
@@ -184,7 +184,7 @@ module Fluent
         if /^\d{4}\/\d{2}\/\d{2} \d{2}:\d{2}:\d{2} \[error\]/.match(log)
           item = /^(?<time>[^ ]+ [^ ]+) \[(?<level>.*)\] (?<pid>\d*)#(?<tid>[^:]*): \*(?<cid>\d*) (?<message>.*)$/.match(log)
 
-          record['time'] = item[:time]
+          record['time'] = record['ctime']
           record['level'] = item[:level]
           record['message'] = item[:message]
           record['process'] = item[:pid]     # process id
@@ -225,61 +225,26 @@ module Fluent
         record.delete('file')
         record.delete('time')
 
-        # 旧版本日志格式解析
-        if /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}\+\d{4} [A-Z]/.match(log)
-
-          item = /^(?<time>[^ ]*) (?<severity>[A-Z])\s* (?<component>(-|([^ ]*)))\s* \[(?<context>[^\]]*)\]\s* ((?<query>.*) protocol:op_query (?<querytime>[\d\.]+(?=ms))|(?<message>.*))/.match(log)
-
-          record['time'] = item[:time]
-          record['severity'] = item[:severity]
-          record['component'] = item[:component]
-          record['context'] = item[:context]
-
-          if item[:message]
-            record['message'] = item[:message]
-            return record
-          end
-
-          if item[:querytime]
-            record['querytime'] = format_str(item[:querytime])
-          end
-
-          if item[:query]
-            record['command'] = item[:query]
-            query = /^command\s* (?<collection>[^ ]*) (?<command>.*)$/.match(item[:query])
-            unless query.nil?
-              record['collection'] = query[:collection]
-              record['command'] = query[:command]
-            end
-          end
-          
-          return record
-        else
-
-          # 版本4.4开始，默认日志为json格式
-          item = JSON.parse(log)
-          record['time'] = item['t']['$date']
-          record['severity'] = item['s']
-          record['component'] = item['c']
-          record['context'] = item['ctx']
-          record['identifier'] = item['id']
-          record['message'] = item['msg']
-
-          attributes = item['attr']
-          if attributes
-            record['querytime'] = attributes['durationMillis']
-            record['collection'] = attributes['ns']
-            record['command'] = attributes['command']
-            record['attr'] = attributes
-          end
-
-          record['tags'] = item['tags']
-          record['truncated'] = item['truncated']
-          record['size'] = item['size']
-        
-          return record
+        # 版本4.4开始，默认日志为json格式
+        item = JSON.parse(log)
+        record['time'] = item['t']['$date']
+        record['severity'] = item['s']
+        record['component'] = item['c']
+        record['context'] = item['ctx']
+        record['identifier'] = item['id']
+        record['message'] = item['msg']
+
+        attributes = item['attr']
+        if attributes
+          record['querytime'] = attributes['durationMillis']
+          record['collection'] = attributes['ns']
+          record['command'] = attributes['command']
+          record['attr'] = attributes
         end
 
+        record['tags'] = item['tags']
+        record['truncated'] = item['truncated']
+        record['size'] = item['size']
         record
       end
 
@@ -292,16 +257,15 @@ module Fluent
 
         if tag == 'app'
 
-          # 未使用
           if @app_stream && record['stream']
-            send(record) if record['stream'] == @app_stream
+            message = 'Stream error' + record['stream']
+            send(tag, message, record) if record['stream'] == @app_stream
           end
 
-          # 未使用
           if @app_message.length > 0 && record['message']
             @app_message.each do |pattern|
               if pattern.match(record['message'])
-                send(record)
+                send(tag, record['message'], record)
                 break
               end
             end
@@ -365,11 +329,13 @@ module Fluent
       # 发送UDP请求
       def send(tag, message, record)
         log.debug('send udp notice')
-        Sentry.capture_message(message, :extra => record, :tags => {'log' => tag})
+        log.info(message)
+        # Sentry.capture_message(message, :extra => record, :tags => {'log' => tag})
       end
 
       # 转数字
-      def format_str(str)
+      def str_to_num(str)
+        return 0 if (str == '-')
         return str.to_i if (str =~ /^\d+$/)
         return str.to_f if (str =~ /^\d+\.\d+$/)
         str

data/sample/README.md

@@ -42,3 +42,8 @@ Initialized empty Git repository in /Users/lilin/developer/light/fluent-plugin-l
 - 安装依赖
 
   gem install sentry-ruby
+
+- 更新依赖版本
+
+  bundle install
+  会修改Gemfile.lock文件

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-light-core
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.6
 platform: ruby
 authors:
 - LIN LI
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-12 00:00:00.000000000 Z
+date: 2021-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 1.14.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -68,7 +68,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.14.10
+        version: 1.14.2
     - - "<"
       - !ruby/object:Gem::Version
         version: '2'
@@ -78,7 +78,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
@@ -88,10 +88,30 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.1.5
+        version: 4.8.0
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: oj
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3.13'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '4'
 description: light core fluent plugin. support mongodb, nginx and application
 email:
 - l.li@alphabets.cn
@@ -116,7 +136,7 @@ homepage: https://git.alphabets.cn/light/fluent-plugin-light-core
 licenses:
 - Apache-2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -132,7 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.0.3
-signing_key: 
+signing_key:
 specification_version: 4
 summary: light core fluent plugin.
 test_files: