instana 1.206.0 → 1.207.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc4bc258b5a217883b3267436a0b70adaef7f270718cd2ab97fc9204c9adab76
-  data.tar.gz: 77e8b1317b0c6739211bee22c63cfdeb2fa4e9a44b21ec43e6ba76c55440e180
+  metadata.gz: 01f078ad2a63d8cd71303a9bf7b413209eda0b2f464ce72f88c84ae05bf797da
+  data.tar.gz: d547946bdbb52ea3c3c3a7fc317f7bcd2dd8ccf37d52507788bff1b85fc4434c
 SHA512:
-  metadata.gz: ebe6816e014418efb136c4b96c73eb186453e1324da065a5a6943c43677ae91a9816d81e2fc1896c33037b13f7958556164adecbf00f5b993787c956e9e2b2ef
-  data.tar.gz: b69393f258edb339153b60f980b168c585c57b364070a90cb97e119b2ed0931ebbdee913353d5761ce383c9eb6bc7eb054e0a471e7fa8b04dd6470fdcac80db0
+  metadata.gz: df3a3926477ab6842628f7fe1062655e63760c0fc1e5100912c8191f5894b8b4dabb1e030441b0b924d379bd6be56a9b69e877c22220153acba3393af59e4b51
+  data.tar.gz: 05fd9a76497614afca946d9538577bdfda21bd3a901759b285d7033425610206fd5a88405f86e86d52928da8f9324798cbf579bb516d845a8749f7c000d98fdf

data/lib/instana/backend/host_agent_reporting_observer.rb

@@ -102,17 +102,27 @@ module Instana
       end
 
       def metrics_payload(discovery)
-        proc_table = Sys::ProcTable.ps(pid: Process.pid)
-        process = ProcessInfo.new(proc_table)
-
-        {
+        payload = {
           pid: discovery['pid'],
-          name: Util.get_app_name,
-          exec_args: process.arguments,
-          gc: GCSnapshot.instance.report,
-          thread: {count: ::Thread.list.count},
-          memory: {rss_size: process.memory_used}
+          name: Util.get_app_name
         }
+
+        if ::Instana.config[:metrics][:memory][:enabled]
+          proc_table = Sys::ProcTable.ps(pid: Process.pid)
+          process = ProcessInfo.new(proc_table)
+          payload[:exec_args] = process.arguments
+          payload[:memory] = {rss_size: process.memory_used}
+        end
+
+        if ::Instana.config[:metrics][:gc][:enabled]
+          payload[:gc] = GCSnapshot.instance.report
+        end
+
+        if ::Instana.config[:metrics][:thread][:enabled]
+          payload[:thread] = {count: ::Thread.list.count}
+        end
+
+        payload
       end
     end
   end

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.206.0"
+  VERSION = "1.207.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/backend/host_agent_reporting_observer_test.rb

@@ -127,6 +127,75 @@ class HostAgentReportingObserverTest < Minitest::Test
     ::Instana.config[:metrics][:enabled] = true
   end
 
+  def test_disable_metrics_memory
+    ::Instana.config[:metrics][:memory][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['exec_args', 'memory']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:memory][:enabled] = true
+  end
+
+  def test_disable_gc
+    ::Instana.config[:metrics][:gc][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['gc']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:gc][:enabled] = true
+  end
+
+  def test_disable_thread
+    ::Instana.config[:metrics][:thread][:enabled] = false
+
+    stub_request(:post, "http://10.10.10.10:9292/tracermetrics")
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby.0")
+      .with(body: ->(data) { (JSON.parse(data).keys & ['thread']).length.eql?(0) })
+      .to_return(status: 200)
+
+    stub_request(:post, "http://10.10.10.10:9292/com.instana.plugin.ruby/traces.0")
+      .to_return(status: 200)
+
+    client = Instana::Backend::RequestClient.new('10.10.10.10', 9292)
+    discovery = Concurrent::Atom.new({'pid' => 0})
+
+    subject = Instana::Backend::HostAgentReportingObserver.new(client, discovery, timer_class: MockTimer)
+
+    subject.report_timer.block.call
+  ensure
+    ::Instana.config[:metrics][:thread][:enabled] = true
+  end
+
   def test_disable_tracing
     ::Instana.config[:tracing][:enabled] = false
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.206.0
+  version: 1.207.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler