instana 1.199.0 → 1.199.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86a3e023781d52d3b5efd25c9b5d304520dd3c88aecde954c326bd736abae787
-  data.tar.gz: b6c7bf11431925b9a48b827b5adbb52d93cb1f1f44bde1ebef98bd89f2188cb0
+  metadata.gz: 3a6f37c619966937fe3690b64d4c42a17ed5ca7da7dc096ec3da0798c2ffb45b
+  data.tar.gz: 6d6af4ce8988c100014548a27fd3ff5b5bc237501d6bfad24ab378a46791b8e2
 SHA512:
-  metadata.gz: e2045faa632b6edc00e4dba26feb69d5249c755698a0dac2adeaa0e2b1cbe65f7f37682f7b59a1d3d000f8908dbee85c4f0356da333f02e874361b5861cfcc3f
-  data.tar.gz: e1b3983ace1be9653732b033902c7f59a74dce020ebfb585e02cf3dfdd1c2e7eb50df4cff9ff4eb8467df3a57b3208165efe659d97073bd6bc97f9e2bdd62fa0
+  metadata.gz: a8f9a656945fe059701409a0009e39fc3a48f4e8dc2f49de71f0510f70f0a32b8458b77dcd08ae3d6c04c2aa526272d432646cf00d4df2c77bfd8b5f0237bb93
+  data.tar.gz: 4c599ce06071fd354b0155e0b9b926be067d7b2e8fafd5e89a5f38f16664b5ce4e991aa836a861c8849e29263332965c63fc85068688c66c0d694a906438f236

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/secrets.rb

@@ -13,21 +13,31 @@ module Instana
     def remove_from_query(str, secret_values = Instana.agent.secret_values)
       return str unless secret_values
 
-      url = URI(str)
-      params = url.scheme ? CGI.parse(url.query || '') : CGI.parse(url.to_s)
+      begin
+        url = URI(str)
+        params = url.scheme ? CGI.parse(url.query || '') : CGI.parse(url.to_s)
+
+        redacted = redact(params, secret_values)
+
+        url.query = URI.encode_www_form(redacted)
+        url.scheme ? CGI.unescape(url.to_s) : CGI.unescape(url.query)
+      rescue URI::InvalidURIError => _e
+        params = CGI.parse(str || '')
+        redacted = redact(params, secret_values)
+        CGI.unescape(URI.encode_www_form(redacted))
+      end
+    end
+
+    private
 
-      redacted = params.map do |k, v|
+    def redact(params, secret_values)
+      params.map do |k, v|
         needs_redaction = secret_values['list']
           .any? { |t| matcher(secret_values['matcher']).(t,k) }
         [k, needs_redaction ? '<redacted>' : v]
       end
-
-      url.query = URI.encode_www_form(redacted)
-      url.scheme ? CGI.unescape(url.to_s) : CGI.unescape(url.query)
     end
 
-    private
-
     def matcher(name)
       case name
       when 'equals-ignore-case'

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.199.0"
+  VERSION = "1.199.5"
   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

@@ -78,6 +78,16 @@ class SecretsTest < Minitest::Test
     assert_redacted @subject.remove_from_query(url, sample_config), %w(instantiate)
   end
 
+  def test_without_url
+    sample_config = {
+      "matcher"=>"contains",
+      "list"=>["stan"]
+    }
+
+    url = 'filter[instantiate]=true'
+    assert_redacted @subject.remove_from_query(url, sample_config), %w(filter[instantiate]), raw_str: true
+  end
+
   private
 
   def url_for(keys)
@@ -86,10 +96,8 @@ class SecretsTest < Minitest::Test
     url.to_s
   end
 
-  def assert_redacted(str, keys)
-    url = URI(str)
-    params = CGI.parse(url.query)
-
+  def assert_redacted(str, keys, raw_str: false)
+    params = raw_str ? CGI.parse(str) : CGI.parse(URI(str).query)
     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.0
+  version: 1.199.5
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler