logstash-output-thinkingdata 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d03c9bd2f5bfd3a753641b13e92cc69607c2490ec79638fe647c3d50fbc84a39
-  data.tar.gz: 1563128b58ad6911ff6e31e3620163d6dbdc13d5b1d12fccf2a5206463ad006b
+  metadata.gz: 36f24c7196c243ee0ec3df9f446f98e60c48d860e6404d6e38897ba2841a99fb
+  data.tar.gz: 9b9fbb9076a958cda52e69775bf23fdfd947c6925ede50cdd86f6d8138f58a2c
 SHA512:
-  metadata.gz: 487f7a87e25265510a05e15266ceae5cecc3e1d184afc128b17fff18ef6d66d6ce1621164eb51eedbb678fc6d40da0c0c02059cf3ffee2cef79c2136e54c1efa
-  data.tar.gz: a8626d2c8a7f289081c50905ce09cd9b97e4eba4152c364cfc00403e70d9f1324c274cb2f505c0f9e78aef185eb52e92474ff15324cf26848fa3c0eed9978468
+  metadata.gz: 2cc68f4e54b11095e2226772967499e4097175a0d4647f32b02eda64b6f5ecfb29f15d7d6e500b6cf92f903e914bdb7880611f713882e7b4a34e7347432a3f19
+  data.tar.gz: d60a81599ec0cf34c697676a85ed6d249e5de8f8d3da74adf6afcdaa42bf01b7e6038d08d8de990478872c023db548df1bafacc243d7c9133e0b9a408cbcf056

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**v1.1.1** (2021-07-10)
+  - 增加json格式校验
+
 **v1.1.0** (2021-01-27)
   - 增加支持数据中的#app_id的格式
 

data/lib/logstash/outputs/thinkingdata.rb

@@ -42,7 +42,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   # 是否检测appid
   config :appid_check, :validate => :boolean, :default => false
 
-  PLUGIN_VERSION = "1.1.0"
+  PLUGIN_VERSION = "1.1.1"
 
   public
 
@@ -140,14 +140,15 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   public
 
   def flush(events, final)
+    events = data_valid(events)
+    data = events.to_json
     if @compress == 0
-      data = events.to_json
       compress_type = 'none'
     else
       gz = StringIO.new("w")
       gz.set_encoding("BINARY")
       z = Zlib::GzipWriter.new(gz)
-      z.write(events.to_json)
+      z.write(data)
       z.close
       data = gz.string
       compress_type = 'gzip'
@@ -233,6 +234,22 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
     result
   end
 
+  private
+
+  def data_valid(events)
+    result = []
+    events.each do |event|
+      begin
+        event.to_json
+        result << event
+      rescue => e
+        @logger.error("Could not parse events", :content => event.to_s, :Exception => e)
+        @parse_error_count += 1
+      end
+    end
+    return result
+  end
+
 end
 
 # class LogStash::Outputs::Thinkingdata

data/logstash-output-thinkingdata.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-thinkingdata'
-  s.version       = '1.1.0'
+  s.version       = '1.1.1'
   s.licenses      = ['Apache-2.0']
   s.summary       = 'Output plugin for Thinkingdata Analytics'
   s.description   = 'This gem is a logstash plugin required to be installed on top of the Logstash core pipeline using $LS_HOME/bin/logstash-plugin install gemname. This gem is not a stand-alone program.'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logstash-output-thinkingdata
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - sdk
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-27 00:00:00.000000000 Z
+date: 2021-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api