fluent-plugin-datadog 0.14.2 → 0.14.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48f262ed0beabe59655088c119c3d7fb732222dabfa116cf0709747a2349f033
-  data.tar.gz: 0e1b786e5e5835021ec3d809172e837446633b0db216406d5a178ddb46f55533
+  metadata.gz: 926fa9b18f9ddafc71acdb33f6a35f9a8f5c8c349aa738c6772f37f4e678c27e
+  data.tar.gz: 334c768913c3bde058cba88d88bd10e343ff92d9d98be29b34efabfb94a3caf3
 SHA512:
-  metadata.gz: 88508d03160cf04f76df7f933d42fccd4dacbaba90e2ec5e5857a9b1c26a7b2c6837e9d5aa183e7eaf4d1bbeaebe02eb04f7fb821c9e9597194f95e30a07bde9
-  data.tar.gz: b9a6e5404fa3a058d3f227248dc1a00874d97689ca77bde92e38a25883eaaac22c221e00a8b4e6229d190030d7168c9823571f01cacc853fdd71ed2feb5bcba2
+  metadata.gz: 8d9919de155b21d18ac85eac0479565fec145468fa169a41b56a12d974ce4326e689cd1794e32f24561639d30561d7c56ef45abd81559191c1d257ff16bab7f4
+  data.tar.gz: 6449bf1033f5a217acf0598426e27aa82dbe546977eab926540bc82ff773a74a726ead6eaa0804b753ec26d42177c4cd843224bf160beca148cc653238b820e0

data/Rakefile

@@ -4,3 +4,12 @@
 # Copyright 2018 Datadog, Inc.
 
 require "bundler/gem_tasks"
+require 'rake/testtask'
+
+task :default => [:test]
+
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/plugin/test*.rb']
+  t.verbose = true
+end

data/fluent-plugin-datadog.gemspec

@@ -31,4 +31,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 12.0"
   spec.add_development_dependency "yajl-ruby", "~> 1.2"
   spec.add_development_dependency 'webmock', "~> 3.6.0"
+
+  spec.metadata      = {
+    'bug_tracker_uri'   => 'https://github.com/DataDog/fluent-plugin-datadog/issues',
+    'changelog_uri'     => 'https://github.com/DataDog/fluent-plugin-datadog/blob/master/CHANGELOG.md',
+    'documentation_uri' => 'https://github.com/DataDog/fluent-plugin-datadog/blob/master/README.md',
+    'source_code_uri'   => 'https://github.com/DataDog/fluent-plugin-datadog'
+  }
 end

data/lib/fluent/plugin/out_datadog.rb

@@ -11,6 +11,10 @@ require "fluent/plugin/output"
 
 require_relative "version"
 
+def nilish?(s)
+  s.empty? || s == "nil" || s == "false" || s == "null"
+end
+
 class Fluent::DatadogOutput < Fluent::Plugin::Output
   class RetryableError < StandardError;
   end
@@ -80,6 +84,8 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
     # Set dd_hostname if not already set (can be set when using fluentd as aggregator)
     @dd_hostname = %x[hostname -f 2> /dev/null].strip
     @dd_hostname = Socket.gethostname if @dd_hostname.empty?
+
+    @timestamp_key = nil if nilish?(@timestamp_key)
   end
 
   def multi_workers_ready?
@@ -420,6 +426,7 @@ class Fluent::DatadogOutput < Fluent::Plugin::Output
       tags.push("container_name:" + kubernetes['container_name']) unless kubernetes['container_name'].nil?
       tags.push("kube_namespace:" + kubernetes['namespace_name']) unless kubernetes['namespace_name'].nil?
       tags.push("pod_name:" + kubernetes['pod_name']) unless kubernetes['pod_name'].nil?
+      tags.push("container_id:" + kubernetes['docker_id']) unless kubernetes['docker_id'].nil?
       return tags.join(",")
     end
     nil

data/lib/fluent/plugin/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DatadogFluentPlugin
-  VERSION = '0.14.2'
+  VERSION = '0.14.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fluent-plugin-datadog
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.14.4
 platform: ruby
 authors:
 - Datadog Solutions Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-01 00:00:00.000000000 Z
+date: 2024-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fluentd
@@ -132,7 +132,11 @@ files:
 homepage: http://datadoghq.com
 licenses:
 - Apache-2.0
-metadata: {}
+metadata:
+  bug_tracker_uri: https://github.com/DataDog/fluent-plugin-datadog/issues
+  changelog_uri: https://github.com/DataDog/fluent-plugin-datadog/blob/master/CHANGELOG.md
+  documentation_uri: https://github.com/DataDog/fluent-plugin-datadog/blob/master/README.md
+  source_code_uri: https://github.com/DataDog/fluent-plugin-datadog
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -148,8 +152,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.7.10
+rubygems_version: 3.3.15
 signing_key:
 specification_version: 4
 summary: Datadog output plugin for Fluent event collector