fluent-plugin-datadog-log 0.1.0.rc18 → 0.1.0

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog-log
 version: !ruby/object:Gem::Version
-  version: 0.1.0.rc18
+  version: 0.1.0
 platform: ruby
 authors:
 - Yusuke KUOKA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2017-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -45,41 +45,13 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.1
-- !ruby/object:Gem::Dependency
-  name: prometheus-client
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.7.1
-- !ruby/object:Gem::Dependency
-  name: semantic_logger
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +122,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: prometheus-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.1
 description: |2
      Fluentd output plugin for the Datadog Log Intake API, which will make
      logs viewable in the Datadog's log viewer.
@@ -165,25 +151,15 @@ files:
 - README.rdoc
 - Rakefile
 - fluent-plugin-datadog-log.gemspec
-- fluent-plugin-datadog-log.gemspec~
 - fluent-plugin-datadog.gemspec~
-- lib/datadog/log.rb~
-- lib/fluent/plugin/datadog_log.rb
-- lib/fluent/plugin/datadog_log.rb~
 - lib/fluent/plugin/monitoring.rb
 - lib/fluent/plugin/out_datadog_log.rb
-- lib/fluent/plugin/out_datadog_log.rb~
-- pkg/fluent-plugin-datadog-log-0.1.0.rc13.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc14.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc15.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc16.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc17.gem
-- pkg/fluent-plugin-datadog-log-0.1.0.rc18.gem
+- pkg/fluent-plugin-datadog-0.1.0.gem
+- pkg/fluent-plugin-datadog-log-0.1.0.gem
 - test/helper.rb
 - test/plugin/base_test.rb
 - test/plugin/constants.rb
 - test/plugin/test_out_datadog_log.rb
-- test/plugin/test_out_datadog_log.rb~
 homepage: https://github.com/mumoshu/fluent-plugin-datadog-log
 licenses:
 - Apache-2.0
@@ -199,9 +175,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13
@@ -213,4 +189,3 @@ test_files:
 - test/plugin/base_test.rb
 - test/plugin/constants.rb
 - test/plugin/test_out_datadog_log.rb
-- test/plugin/test_out_datadog_log.rb~

data/fluent-plugin-datadog-log.gemspec~

@@ -1,33 +0,0 @@
-Gem::Specification.new do |gem|
-  gem.name          = 'fluent-plugin-datadog-log'
-  gem.description   = <<-eos
-   Fluentd output plugin for the Datadog Log Intake API, which will make
-   logs viewable in the Datadog's log viewer.
-eos
-  gem.summary       = 'fluentd output plugin for the Datadog Log Intake API'
-  gem.homepage      = \
-    'https://github.com/mumoshu/fluent-plugin-datadog-log'
-  gem.license       = 'Apache-2.0'
-  gem.version       = '0.1.0.rc12'
-  gem.authors       = ['Yusuke KUOKA']
-  gem.email         = ['ykuoka@gmail.com']
-  gem.required_ruby_version = Gem::Requirement.new('>= 2.0')
-
-  gem.files         = Dir['**/*'].keep_if { |file| File.file?(file) }
-  gem.test_files    = gem.files.grep(/^(test)/)
-  gem.require_paths = ['lib']
-
-  gem.add_runtime_dependency 'fluentd', '~> 1.0.0'
-  # gem.add_runtime_dependency 'datadog-log-api-client', '~> 0.1'
-  gem.add_runtime_dependency 'json', '~> 1.8'
-
-  gem.add_dependency 'net_tcp_client', '~> 2.0.1'
-  gem.add_dependency 'prometheus-client', '~> 0.7.1'
-  gem.add_dependency 'semantic_logger', '~> 4.2.0'
-
-  gem.add_development_dependency 'mocha', '~> 1.1'
-  gem.add_development_dependency 'rake', '~> 10.3'
-  gem.add_development_dependency 'rubocop', '~> 0.35.0'
-  gem.add_development_dependency 'webmock', '~> 2.3.1'
-  gem.add_development_dependency 'test-unit', '~> 3.0'
-end

data/lib/datadog/log.rb~

@@ -1,125 +0,0 @@
-require 'openssl'
-require 'net/tcp_client'
-require 'socket'
-require 'time'
-
-module Datadog
-  module Log
-    TRUNCATED_MSG = '...TRUNCATED...'
-
-    TRUNCATED_LEN = TRUNCATED_MSG.size
-
-    # MaxMessageLen is the maximum length for any message we send to the intake
-    # see https://github.com/DataDog/datadog-log-agent/blob/2394da8c79a6cadbcd1e98d6c89c437becec2732/pkg/config/constants.go#L9-L10
-    DD_MAX_MESSAGE_LEN = 1 * 1000 * 1000
-
-    MAX_MESSAGE_LEN = DD_MAX_MESSAGE_LEN - TRUNCATED_LEN
-
-    def truncate_message(msg)
-      if msg.size > DD_MAX_MESSAGE_LEN
-        msg.slice(0, MAX_MESSAGE_LEN) + TRUNCATED_MSG
-      else
-        msg
-      end
-    end
-
-    # Given a list of tags, build_tags_payload generates the bytes array
-    # that will be inserted into messages
-    # @see https://github.com/DataDog/datadog-log-agent/blob/2394da8c79a6cadbcd1e98d6c89c437becec2732/pkg/config/integration_config.go#L180
-    def build_tags_payload(config_tags:, source:, source_category:)
-      payload = ''
-
-      payload = "[dd ddsource=\"#{source}\"]" if !source.nil? && source != ''
-
-      if !source_category.nil? && source_category != ''
-        payload = "#{payload}[dd ddsourcecategory=\"#{source_category}\"]"
-      end
-
-      if !config_tags.nil? && config_tags != ''
-        config_tags = config_tags.join(',') if config_tags.is_a? ::Array
-        payload = "#{payload}[dd ddtags=\"#{config_tags}\"]"
-      end
-
-      payload
-    end
-
-    # https://github.com/DataDog/datadog-log-agent/blob/db13b53dfdd036d43acfb15089a43eb31548f09f/pkg/processor/processor.go#L65
-    def build_extra_content(timestamp:, hostname:, service:, tags_payload:)
-      "<46>0 #{timestamp} #{hostname} #{service} - - #{tags_payload}"
-    end
-
-    def build_api_key_str(api_key:, logset:)
-      if !logset.nil? && logset != ''
-        "#{api_key}/#{logset}"
-      else
-        api_key
-      end
-    end
-
-    # build_payload returns a processed payload from a raw message
-    # @param [String] api_key_str
-    # @param [String] extra_content
-    # @param [String] msg
-    def create_payload(api_key_str:, msg:, extra_content:)
-      "#{api_key_str} #{extra_content} #{msg}\n"
-    end
-
-    class Client
-      include ::Datadog::Log
-
-      def initialize(log_dd_url: 'intake.logs.datadoghq.com', log_dd_port: 10516, api_key:, hostname:, skip_ssl_validation: false)
-        @log_dd_url = log_dd_url
-        @log_dd_port = log_dd_port
-        @api_key = api_key
-        @hostname = hostname
-        @skip_ssl_validation = skip_ssl_validation
-
-        init_api_client
-      end
-
-      def send_payload(logset: 'main', msg:, datetime: nil, service:, source:, source_category:, tags:)
-        datetime = DateTime.now if datetime.nil?
-
-        # new_offset(0) is required. otherwise datadog will silently throws away the log..
-        timestamp_str = datetime.new_offset(0).rfc3339(6)
-        payload = create_payload(
-          api_key_str: build_api_key_str(api_key: @api_key, logset: logset),
-          msg: truncate_message(msg),
-          extra_content: build_extra_content(
-            timestamp: timestamp_str,
-            hostname: @hostname,
-            service: service,
-            tags_payload: build_tags_payload(
-              config_tags: tags,
-              source: source,
-              source_category: source_category
-            )
-          )
-        )
-        @conn.retry_on_connection_failure do
-          @conn.write(payload)
-        end
-        payload
-      end
-
-      def shutdown
-        @conn.close unless @conn.nil?
-      end
-
-      class << self
-        def from_env
-          new(api_key: ENV['DD_LOG_API_KEY'], hostname: Socket.gethostname)
-        end
-      end
-
-      private
-
-      def init_api_client
-        ssl = true
-        ssl = { verify_mode: OpenSSL::SSL::VERIFY_NONE } if @skip_ssl_validation
-        server = "#{@log_dd_url}:#{@log_dd_port}"
-        @conn = Net::TCPClient.new(server: server, ssl: ssl)
-      end
-    end
-  end
-end

data/lib/fluent/plugin/datadog_log.rb

@@ -1,166 +0,0 @@
-require 'openssl'
-
-require 'semantic_logger'
-
-SemanticLogger.default_level = :info
-SemanticLogger.add_appender(io: STDOUT, formatter: :json)
-
-require 'net/tcp_client'
-require 'socket'
-require 'time'
-
-# Never give up on a write timeout/Fix for:
-#  Not retrying a log message later
-#  error=\"Timed out after 60.0 seconds trying to write to
-#  intake.logs.datadoghq.com[52.206.154.220]:10516\"
-#  error_class=Net::TCPClient::WriteTimeout
-Net::TCPClient.reconnect_on_errors << Net::TCPClient::WriteTimeout
-
-# Never give up on a corrupted SSL connection/Fix for:
-#  Not retrying a log message later
-#  error="SSL_write: bad write retry"
-#  error_class=OpenSSL::SSL::SSLError
-Net::TCPClient.reconnect_on_errors << OpenSSL::SSL::SSLError
-
-# Datadog provides various helpers to programatically access Datadog services
-module Datadog
-  # Log provides various helpers and classes to support programatically
-  # accessing Datadog Log Management
-  module Log
-    TRUNCATED_MSG = '...TRUNCATED...'
-
-    TRUNCATED_LEN = TRUNCATED_MSG.size
-
-    # MaxMessageLen is the maximum length for any message we send to the intake
-    # see https://github.com/DataDog/datadog-log-agent/blob/2394da8c79a6cadbcd1e98d6c89c437becec2732/pkg/config/constants.go#L9-L10
-    DD_MAX_MESSAGE_LEN = 1 * 1000 * 1000
-
-    MAX_MESSAGE_LEN = DD_MAX_MESSAGE_LEN - TRUNCATED_LEN
-
-    def truncate_message(msg)
-      if msg.size > DD_MAX_MESSAGE_LEN
-        msg.slice(0, MAX_MESSAGE_LEN) + TRUNCATED_MSG
-      else
-        msg
-      end
-    end
-
-    # Given a list of tags, build_tags_payload generates the bytes array
-    # that will be inserted into messages
-    # @see https://github.com/DataDog/datadog-log-agent/blob/2394da8c79a6cadbcd1e98d6c89c437becec2732/pkg/config/integration_config.go#L180
-    def build_tags_payload(config_tags:, source:, source_category:)
-      payload = ''
-
-      payload = "[dd ddsource=\"#{source}\"]" if !source.nil? && source != ''
-
-      if !source_category.nil? && source_category != ''
-        payload = "#{payload}[dd ddsourcecategory=\"#{source_category}\"]"
-      end
-
-      if !config_tags.nil? && config_tags != ''
-        config_tags = config_tags.join(',') if config_tags.is_a? ::Array
-        payload = "#{payload}[dd ddtags=\"#{config_tags}\"]"
-      end
-
-      payload
-    end
-
-    # https://github.com/DataDog/datadog-log-agent/blob/db13b53dfdd036d43acfb15089a43eb31548f09f/pkg/processor/processor.go#L65
-    def build_extra_content(timestamp:, hostname:, service:, tags_payload:)
-      "<46>0 #{timestamp} #{hostname} #{service} - - #{tags_payload}"
-    end
-
-    def build_api_key_str(api_key:, logset:)
-      if !logset.nil? && logset != ''
-        "#{api_key}/#{logset}"
-      else
-        api_key
-      end
-    end
-
-    # build_payload returns a processed payload from a raw message
-    # @param [String] api_key_str
-    # @param [String] extra_content
-    # @param [String] msg
-    def create_payload(api_key_str:, msg:, extra_content:)
-      "#{api_key_str} #{extra_content} #{msg}\n"
-    end
-
-    # Client supports building/sending payloads to Datadog Log Management
-    class Client
-      include ::Datadog::Log
-
-      def initialize(
-        log_dd_url: 'intake.logs.datadoghq.com',
-        log_dd_port: 10516,
-        api_key:,
-        hostname:,
-        skip_ssl_validation: false
-      )
-        @log_dd_url = log_dd_url
-        @log_dd_port = log_dd_port
-        @api_key = api_key
-        @hostname = hostname
-        @skip_ssl_validation = skip_ssl_validation
-
-        init_api_client
-      end
-
-      # rubocop:disable Metrics/ParameterLists
-      def send_payload(
-        logset: 'main',
-        msg:,
-        datetime: nil,
-        service:,
-        source:,
-        source_category:,
-        tags:
-      )
-        # rubocop:enable Metrics/ParameterLists
-
-        datetime = DateTime.now if datetime.nil?
-
-        # new_offset(0) is required.
-        # otherwise datadog will silently throws away the log..
-        timestamp_str = datetime.new_offset(0).rfc3339(6)
-        payload = create_payload(
-          api_key_str: build_api_key_str(api_key: @api_key, logset: logset),
-          msg: truncate_message(msg),
-          extra_content: build_extra_content(
-            timestamp: timestamp_str,
-            hostname: @hostname,
-            service: service,
-            tags_payload: build_tags_payload(
-              config_tags: tags,
-              source: source,
-              source_category: source_category
-            )
-          )
-        )
-        @conn.retry_on_connection_failure do
-          @conn.write(payload)
-        end
-        payload
-      end
-
-      def shutdown
-        @conn.close unless @conn.nil?
-      end
-
-      class << self
-        def from_env
-          new(api_key: ENV['DD_LOG_API_KEY'], hostname: Socket.gethostname)
-        end
-      end
-
-      private
-
-      def init_api_client
-        ssl = true
-        ssl = { verify_mode: OpenSSL::SSL::VERIFY_NONE } if @skip_ssl_validation
-        server = "#{@log_dd_url}:#{@log_dd_port}"
-        @conn = Net::TCPClient.new(server: server, ssl: ssl)
-      end
-    end
-  end
-end