logstash-output-thinkingdata 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a59cb189b3b65b95a23f1c54039948220adc9701d61425441c21e6ae13f0a207
-  data.tar.gz: bffcdc6a7f831a884cef5dfb94d9da423f356c86994fa9e17da2350d7a552002
+  metadata.gz: e867be173142072e9d2355704097e7440cbc159c2a1a7de39f8dc97e6d2e60df
+  data.tar.gz: 92bd1a49b9f661d64370b2ba2e1fdbb6005e98dfa66850feb649113582a1f687
 SHA512:
-  metadata.gz: '048904134164411ec9b61e60719a264b43c2d4dc7faa4220eb47a88d52077090b6c4ca5b0259cba32c3707d1bc67564bedd3aeb82ed84ddd9dbdea5a1e042956'
-  data.tar.gz: 7f7ff7da269b11ac1ce317c3562ac8371bb92a92d6338c9a13a55902a9112e05f6f3d5b90d5a561bcc894021f327762ee88340c6b102f799c149864403a3e87a
+  metadata.gz: eae1bf5a3dc7e72d02610ff020d3541df9a64a39504699f6dba1e4e61e0de429c45b7322693cd88f8f0b5016e254a8e0452fb6ab4454b5529ea8597fd6de3dd4
+  data.tar.gz: 73ed46b15a675a0d2b8ae7f1dbb897cb05147a7ac12a72552f944ffd366bc820b5c01ed75e5238056e9fff70bd9caec2deb728dab846e57b467070545d0698ce

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+**v1.2.1** (2023-07-26)
+  - 增加对message中的数据进行格式校验
+
 **v1.2.0** (2023-04-25)
   - 支持message中传多条数据
 

data/lib/logstash/outputs/thinkingdata.rb

@@ -41,7 +41,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   # 是否检测appid
   config :appid_check, :validate => :boolean, :default => false
 
-  PLUGIN_VERSION = "1.2.0"
+  PLUGIN_VERSION = "1.2.1"
 
   public
 
@@ -82,7 +82,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
 
   # def register
 
-  #验证appid
+  # 验证appid
 
   private
 
@@ -99,8 +99,13 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
   end
 
   def send_content(content, event)
+    if content.to_s[0, 1] != '{'
+      @logger.error("data error: " + content.to_s)
+      @parse_error_count += 1
+      return
+    end
     content['#uuid'] = SecureRandom.uuid if @uuid
-    if is_filebeat_input?(event) #filebeat input 记录
+    if is_filebeat_input?(event) # filebeat input 记录
       host = event.get("[host][name]")
       file = event.get("[log][file][path]")
       file = event.get("[source]") if file.nil?
@@ -126,13 +131,15 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
           contents.each do |content|
             begin
               send_content(content, event)
+            rescue => e
+              @logger.error("Could not process content", :content => event.to_s, :Exception => e)
+              @parse_error_count += 1
             end
           end
         else
           content = JSON.parse(message)
           send_content(content, event)
         end
-
       rescue => e
         @logger.error("Could not process content", :content => event.to_s, :Exception => e)
         @parse_error_count += 1
@@ -178,7 +185,7 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
                   'TA-Integration-Version' => PLUGIN_VERSION, 'TA-Integration-Count' => events.length.to_s }
     end
 
-    until do_send(data, headers)
+    until do_send(data, events, headers)
       sleep 5
     end
     @total_send_count += events.length
@@ -186,12 +193,17 @@ class LogStash::Outputs::Thinkingdata < LogStash::Outputs::Base
 
   private
 
-  def do_send(data, headers)
+  def do_send(data, events, headers)
     begin
       response = @client.post(@url, :body => data, :headers => headers).call
       if response.code != 200
         @logger.error("Send failed, code: #{response.code}, body: #{response.body}", :url => @url)
         return false
+      else
+        response_body = JSON.parse(response.body)
+        if response_body["code"] != 0
+          @logger.error("Send failed, code: #{response.code}, body: #{response.body}, request data: #{events.to_s}", :url => @url)
+        end
       end
     rescue => e
       @logger.error("Send failed", :url => @url, :exception => e.class.name, :backtrace => e.backtrace)

data/logstash-output-thinkingdata.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'logstash-output-thinkingdata'
-  s.version       = '1.2.0'
+  s.version       = '1.2.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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - sdk
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-04-25 00:00:00.000000000 Z
+date: 2023-07-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-core-plugin-api