fluent-plugin-dynatrace 0.1.2 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '079c6d4ed7f57e7515b28e0534d17184348f4a5f7923671db41938e8e2311f42'
-  data.tar.gz: 50d12a02dc77792523d4f4054842bba5f946c76e593bba3b360b9f380ad1b291
+  metadata.gz: 3ed15669d3529fd2d869b4e620a38caee00310b2cc5a56bd3ea5d879b3e0a61a
+  data.tar.gz: a4cb4ba89820f96e07fc9b0f96bc9716d97c64d86987d6a7eee9e54bc8a69936
 SHA512:
-  metadata.gz: 4b2a31a3d1bad3a41da2f1604e5fd62115288389132266530ed3e048824d2399a2380a7d4a312c5e14dbfbe1159dfb7b54b17c24fbc62ddbf8ad42678e175e39
-  data.tar.gz: 365bcde6db2227dadc32ae83cf8644795a3cc67563c8ebd657c874a6ef55e21dc7606188368bb8646baa13154caa66649ad02fb508f2d0fe41571d9dbfad6051
+  metadata.gz: 5d610192bd5c57739f5fb3a0cc37d4e2ab277a08b049ebf719051b624e755f67fc46392758042de0982b56bbd5ca2c821d88e9a8d481370899e7b0d20cb8f907
+  data.tar.gz: 232945ad4cc7cc31f01599700a465868b1e97159371b7a09a4ad8abac7347ae4ccdb8460831eea6c0ad632d2d4dd18defe951bc7f806a95a30263f369024dc4b

data/lib/fluent/plugin/dynatrace_constants.rb

@@ -20,7 +20,7 @@ module Fluent
     class DynatraceOutputConstants
       # The version of the Dynatrace output plugin
       def self.version
-        '0.1.2'
+        '0.1.6'
       end
     end
   end

data/lib/fluent/plugin/out_dynatrace.rb

@@ -24,17 +24,24 @@ module Fluent
     class DynatraceOutput < Output
       Fluent::Plugin.register_output('dynatrace', self)
 
+      HTTP_REQUEST_LOCK = Mutex.new
+
       helpers :compat_parameters # add :inject if need be
 
       # Configurations
       desc 'The full URL of the Dynatrace log ingestion endpoint, e.g. https://my-active-gate.example.com/api/logs/ingest'
       config_param :active_gate_url, :string
-      desc 'The API token to use to authenticate requests to the log ingestion endpoint. Must have TODO scope'
+      desc 'The API token to use to authenticate requests to the log ingestion endpoint. '\
+           'Must have logs.ingest (Ingest Logs) scope. '\
+           'It is recommended to limit scope to only this one.'
       config_param :api_token, :string, secret: true
 
       desc 'Disable SSL validation by setting :verify_mode OpenSSL::SSL::VERIFY_NONE'
       config_param :ssl_verify_none, :bool, default: false
 
+      desc 'Inject timestamp into each log message'
+      config_param :inject_timestamp, :bool, default: false
+
       #############################################
 
       config_section :buffer do
@@ -74,20 +81,29 @@ module Fluent
       #############################################
 
       def process(_tag, es)
+        log.on_trace { log.trace('#process') }
+        records = 0
         # es = inject_values_to_event_stream(tag, es)
-        es.each do |_time, record|
-          send_to_dynatrace("#{record.to_json.chomp}\n")
+        es.each do |time, record|
+          records += 1
+          log.on_trace { log.trace("#process Processing record #{records}") }
+          record['@timestamp'] = time * 1000 if @inject_timestamp
+          synchronized_send_records(record)
         end
+        log.on_trace { log.trace("#process Processed #{records} records") }
       end
 
       def write(chunk)
-        body = []
-        chunk.each do |_time, record|
-          # body.push(inject_values_to_record(chunk.metadata.tag, time, record))
-          body.push(record)
+        log.on_trace { log.trace('#write') }
+        records = []
+        chunk.each do |time, record|
+          # records.push(inject_values_to_record(chunk.metadata.tag, time, record))
+          record['@timestamp'] = time * 1000 if @inject_timestamp
+          records.push(record)
         end
 
-        send_to_dynatrace("#{body.to_json.chomp}\n")
+        log.on_trace { log.trace("#write sent #{records.length} records") }
+        synchronized_send_records(records) unless records.empty?
       end
 
       #############################################
@@ -106,7 +122,8 @@ module Fluent
         "fluent-plugin-dynatrace v#{DynatraceOutputConstants.version}"
       end
 
-      def prepare_request(uri)
+      def prepare_request
+        log.on_trace { log.trace('#prepare_request') }
         req = Net::HTTP::Post.new(uri, { 'User-Agent' => user_agent })
         req['Content-Type'] = 'application/json; charset=utf-8'
         req['Authorization'] = "Api-Token #{@api_token}"
@@ -114,15 +131,37 @@ module Fluent
         req
       end
 
-      def send_to_dynatrace(body)
+      def synchronized_send_records(records)
+        log.on_trace { log.trace('#synchronized_send_records') }
+        HTTP_REQUEST_LOCK.synchronize do
+          send_records(records)
+        end
+      end
+
+      def send_records(records)
+        log.on_trace { log.trace('#send_records') }
+
         agent.start unless agent.started?
 
-        req = prepare_request(@uri)
-        res = @agent.request(req, body)
+        response = send_request(serialize(records))
+
+        return if response.is_a?(Net::HTTPSuccess)
 
-        return if res.is_a?(Net::HTTPSuccess)
+        raise failure_message response
+      end
+
+      def serialize(records)
+        log.on_trace { log.trace('#serialize') }
+        body = "#{records.to_json.chomp}\n"
+        log.on_trace { log.trace("#serialize body length #{body.length}") }
+        body
+      end
 
-        raise failure_message res
+      def send_request(body)
+        log.on_trace { log.trace('#send_request') }
+        response = @agent.request(prepare_request, body)
+        log.on_trace { log.trace("#send_request response #{response}") }
+        response
       end
 
       def failure_message(res)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-dynatrace
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.6
 platform: ruby
 authors:
 - Dynatrace Open Source Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-25 00:00:00.000000000 Z
+date: 2021-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -102,7 +102,7 @@ files:
 - LICENSE
 - lib/fluent/plugin/dynatrace_constants.rb
 - lib/fluent/plugin/out_dynatrace.rb
-homepage: https://www.dynatrace.com/
+homepage: https://github.com/dynatrace-oss/fluent-plugin-dynatrace
 licenses:
 - Apache-2.0
 metadata:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A fluentd output plugin for sending logs to the Dynatrace Generic log ingest