From c1cdc831b0f787cbdf55706e851ff89473a92d5b Mon Sep 17 00:00:00 2001
From: Rock Baek <rbaek@splunk.com>
Date: Tue, 25 Jan 2022 13:58:10 -0800
Subject: [PATCH] merge to main (1.1.9) (#110)

* converted divisor to float for cpu metrics (#108)
---
 Gemfile.lock                               | 12 ++++++------
 VERSION                                    |  2 +-
 docker/Gemfile.lock                        |  3 +--
 lib/fluent/plugin/in_kubernetes_metrics.rb |  8 ++++----
 test/plugin/test_in_kubernetes_metrics.rb  |  2 +-
 5 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/Gemfile.lock b/Gemfile.lock
index aebbcab..05aa341 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.8)
+    fluent-plugin-kubernetes-metrics (1.1.9)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -23,10 +23,10 @@ GEM
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
       rake
-    fluentd (1.14.2)
+    fluentd (1.14.4)
       bundler
       cool.io (>= 1.4.5, < 2.0.0)
-      http_parser.rb (>= 0.5.1, < 0.8.0)
+      http_parser.rb (>= 0.5.1, < 0.9.0)
       msgpack (>= 1.3.1, < 2.0.0)
       serverengine (>= 2.2.2, < 3.0.0)
       sigdump (~> 0.2.2)
@@ -47,15 +47,15 @@ GEM
     http-form_data (2.3.0)
     http-parser (1.2.3)
       ffi-compiler (>= 1.0, < 2.0)
-    http_parser.rb (0.7.0)
+    http_parser.rb (0.8.0)
     json (2.6.1)
     kubeclient (4.6.0)
       http (>= 3.0, < 5.0)
       recursive-open-struct (~> 1.0, >= 1.0.4)
       rest-client (~> 2.0)
-    mime-types (3.3.1)
+    mime-types (3.4.1)
       mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
+    mime-types-data (3.2022.0105)
     msgpack (1.4.2)
     multi_json (1.14.1)
     netrc (0.11.0)
diff --git a/VERSION b/VERSION
index db15278..a5e4282 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.1.8
\ No newline at end of file
+1.1.9
\ No newline at end of file
diff --git a/docker/Gemfile.lock b/docker/Gemfile.lock
index 05491a5..c9d688e 100644
--- a/docker/Gemfile.lock
+++ b/docker/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
   remote: gem
   specs:
-    fluent-plugin-kubernetes-metrics (1.1.8)
+    fluent-plugin-kubernetes-metrics (1.1.9)
       fluentd (>= 1.9.1)
       kubeclient (~> 4.6.0)
       multi_json (~> 1.14.1)
@@ -151,7 +151,6 @@ GEM
       httpclient (>= 2.4)
     webrick (1.7.0)
     yajl-ruby (1.4.1)
-    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
diff --git a/lib/fluent/plugin/in_kubernetes_metrics.rb b/lib/fluent/plugin/in_kubernetes_metrics.rb
index 1face14..261192c 100644
--- a/lib/fluent/plugin/in_kubernetes_metrics.rb
+++ b/lib/fluent/plugin/in_kubernetes_metrics.rb
@@ -315,7 +315,7 @@ def emit_cpu_metrics(tag:, metrics:, labels:)
         unless metrics['time'].nil?
           time = parse_time metrics['time']
           if usage_rate = metrics['usageNanoCores']
-            router.emit generate_tag("#{tag}.cpu.usage_rate"), time, labels.merge('value' => usage_rate / 1_000_000)
+            router.emit generate_tag("#{tag}.cpu.usage_rate"), time, labels.merge('value' => usage_rate / 1_000_000.0)
           end
           if usage = metrics['usageNanoCores']
             router.emit generate_tag("#{tag}.cpu.usage"), time, labels.merge('value' => usage)
@@ -416,13 +416,13 @@ def emit_stats_breakdown(stats)
 
       def emit_cpu_metrics_stats(tag:, metrics:, labels:, time:)
         if cpu_usage_total = metrics['usage']['total']
-          router.emit generate_tag("#{tag}.cpu.usage.total"), time, labels.merge('value' => cpu_usage_total / 1_000_000)
+          router.emit generate_tag("#{tag}.cpu.usage.total"), time, labels.merge('value' => cpu_usage_total / 1_000_000.0)
         end
         if cpu_usage_user = metrics['usage']['user']
-          router.emit generate_tag("#{tag}.cpu.usage.user"), time, labels.merge('value' => cpu_usage_user / 1_000_000)
+          router.emit generate_tag("#{tag}.cpu.usage.user"), time, labels.merge('value' => cpu_usage_user / 1_000_000.0)
         end
         if cpu_usage_system = metrics['usage']['system']
-          router.emit generate_tag("#{tag}.cpu.usage.system"), time, labels.merge('value' => cpu_usage_system / 1_000_000)
+          router.emit generate_tag("#{tag}.cpu.usage.system"), time, labels.merge('value' => cpu_usage_system / 1_000_000.0)
         end
 
         if cpu_cfs_periods = metrics['cfs']['periods']
diff --git a/test/plugin/test_in_kubernetes_metrics.rb b/test/plugin/test_in_kubernetes_metrics.rb
index 7ae81a2..cc99f96 100644
--- a/test/plugin/test_in_kubernetes_metrics.rb
+++ b/test/plugin/test_in_kubernetes_metrics.rb
@@ -115,7 +115,7 @@ def create_driver(conf = CONFIG)
       assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'], @@hash_map_test['kube.node.cpu.usage'][2]['value']
 
       assert_not_nil @@hash_map_test.key?('kube.node.cpu.usage_rate')
-      assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'] / 1_000_000, @@hash_map_test['kube.node.cpu.usage_rate'][2]['value']
+      assert_equal @@parsed_unit_string['node']['cpu']['usageNanoCores'] / 1_000_000.0, @@hash_map_test['kube.node.cpu.usage_rate'][2]['value']
     end
 
     test 'test_emit_memory_metrics' do