instana 1.199.1 → 1.199.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5bfc77f8ea09bd4e8c493e97261b962a4b4f6227de513806b7b41beacea46118
-  data.tar.gz: 3ab9bc87d33895f4df52ba02bb9f9dfd14364547fb9ebe4b4ef47ab1a2ef1aa0
+  metadata.gz: 526295c3e1f9ca3b4363e61b235d76a80974b34d293c35cd260ab3c675864aa2
+  data.tar.gz: b9aea4aefede1996ee91bce87ec45b009694486279e76430b4df546733ad4a53
 SHA512:
-  metadata.gz: 2cfcd49b02a42fd0160c50584cd62c2b98664f7d416dc7935a53d72e092d96dfeead989fc58ab66f95acdde4ef48acdf7179e4dbcbe4a58906c41d6380ec700e
-  data.tar.gz: 7d6265faff1cad2ae597f66397d192d9ed1dbbe5634d1c3aeeb1d05ac2a8548061a8023990b296bb9a23934b1d0fc396ff267eb282a265415c56e1d986dbd9af
+  metadata.gz: f090f6841a6ce59e4f4c0adeb6ccb5bec5691447a099610651460744ff15dae0b589a801f3e8ee89468ee0bd6df440b57ae4619e9ed0fb6fca07e79af9c4ca2d
+  data.tar.gz: 4010db830f3fc6d31a775d752be1075d7aa2aa6620a1abeba4298294a8878f17b0b88b4f06e5d7f059b353ef1a1a8d5cce774aa56ccc11366b2a61e2487f2940

data/lib/instana/activators/resque_worker.rb

@@ -16,11 +16,8 @@ module Instana
         ::Resque::Worker.prepend(::Instana::Instrumentation::ResqueWorker)
         ::Resque::Job.prepend(::Instana::Instrumentation::ResqueJob)
 
-        ::Resque.before_fork do |_job|
-          ::Instana.agent.before_resque_fork
-        end
         ::Resque.after_fork do |_job|
-          ::Instana.agent.after_resque_fork
+          ::Instana.agent.after_fork
         end
 
         # Set this so we assure that any remaining collected traces are reported at_exit

data/lib/instana/backend/host_agent.rb

@@ -19,17 +19,25 @@ module Instana
         return if ENV.key?('INSTANA_TEST')
 
         @future = Concurrent::Promises.future do
-          client = until_not_nil { HostAgentLookup.new.call }
-          @discovery.delete_observers
-          @discovery
-            .with_observer(HostAgentActivationObserver.new(client, @discovery))
-            .with_observer(HostAgentReportingObserver.new(client, @discovery))
-
-          @discovery.swap { nil }
-          client
+          announce
         end
       end
 
+      alias start spawn_background_thread
+
+      def announce
+        client = until_not_nil { HostAgentLookup.new.call }
+        @discovery.delete_observers
+        @discovery
+          .with_observer(HostAgentActivationObserver.new(client, @discovery))
+          .with_observer(HostAgentReportingObserver.new(client, @discovery))
+
+        @discovery.swap { nil }
+        client
+      end
+
+      alias after_fork announce
+
       # @return [Boolean] true if the agent able to send spans to the backend
       def ready?
         ENV.key?('INSTANA_TEST') || !@discovery.value.nil?

data/lib/instana/backend/host_agent_activation_observer.rb

@@ -12,7 +12,7 @@ module Instana
 
       # @param [RequestClient] client used to make requests to the backend
       # @param [Concurrent::Atom] discovery object used to store discovery response in
-      def initialize(client, discovery, wait_time: 1, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
+      def initialize(client, discovery, wait_time: 30, logger: ::Instana.logger, max_wait_tries: 60, proc_table: Sys::ProcTable, socket_proc: default_socket_proc) # rubocop:disable Metrics/ParameterLists
         @client = client
         @discovery = discovery
         @wait_time = wait_time
@@ -82,7 +82,7 @@ module Instana
       def try_forever_with_backoff
         yield
       rescue DiscoveryError, Net::OpenTimeout => e
-        @logger.warn(e)
+        @logger.debug(e)
         sleep(@wait_time)
         retry
       rescue StandardError => e

data/lib/instana/backend/serverless_agent.rb

@@ -32,6 +32,9 @@ module Instana
         @timer.execute
       end
 
+      alias start spawn_background_thread
+      alias after_fork spawn_background_thread
+
       # @return [Boolean] true if the agent able to send spans to the backend
       def ready?
         true

data/lib/instana/version.rb

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

data/test/backend/host_agent_test.rb

@@ -44,4 +44,14 @@ class HostAgentTest < Minitest::Test
     subject = Instana::Backend::HostAgent.new(discovery: discovery)
     assert_equal 1, subject.source[:e]
   end
+
+  def test_start
+    subject = Instana::Backend::HostAgent.new
+    assert subject.respond_to? :start
+  end
+
+  def test_after_fork
+    subject = Instana::Backend::HostAgent.new
+    assert subject.respond_to? :after_fork
+  end
 end

data/test/backend/serverless_agent_test.rb

@@ -70,4 +70,14 @@ class ServerlesAgentTest < Minitest::Test
 
     subject.timer.block.call
   end
+
+  def test_start
+    subject = Instana::Backend::ServerlessAgent.new([], timer_class: MockTimer, backend_uri: 'http://10.10.10.10:9292/', logger: Logger.new('/dev/null'))
+    assert subject.respond_to? :start
+  end
+
+  def test_after_fork
+    subject = Instana::Backend::ServerlessAgent.new([], timer_class: MockTimer, backend_uri: 'http://10.10.10.10:9292/', logger: Logger.new('/dev/null'))
+    assert subject.respond_to? :after_fork
+  end
 end

data/test/secrets_test.rb

@@ -98,8 +98,6 @@ class SecretsTest < Minitest::Test
 
   def assert_redacted(str, keys, raw_str: false)
     params = raw_str ? CGI.parse(str) : CGI.parse(URI(str).query)
-    pp params
-
     assert_equal keys, params.select { |_, v| v == %w(<redacted>) }.keys, 'to be redacted'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.199.1
+  version: 1.199.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-12 00:00:00.000000000 Z
+date: 2021-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler