instana 1.198.0 → 1.199.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dca649979bd82548097afd526fd4258ffd43b08255a412e273eb35741b08e09
-  data.tar.gz: 5565917d5389fd564caa3146df077617e58447d981fcc09958ea7fa4aff5c6d4
+  metadata.gz: 312c663203c4deb4371785441a0d2fa2283b9809795bbfb2f5e00a6d9d29cea8
+  data.tar.gz: 23393b6158d94cdfd25c1f25c5af4ec6575fdda93b2e5f7292b02dd3e929841c
 SHA512:
-  metadata.gz: c71f8804c226548e29b05cb2ba69a207f71bf9a67d97d879269316c1267c8abf0faaf74b06fe4514d15427ff3e0fb16575e1d3101e5f0f7d0e26c9c7275fdde0
-  data.tar.gz: feafba3def0b0321d38944061c3577e4d77bfb6bde9f6b927bfe201f55889c511f407b5d8de248c50c25f109aea22a46cede3089bf3db7931ac7b6768d73509b
+  metadata.gz: b010383d56419547cc186a43532d90a1f26c01e3a0cde126257fc9e2633e033cccb7ec8b34583808a2f806cb58b579d4384dbdc43f49e7064f32099be1d5eff4
+  data.tar.gz: 30359b5a5e3e25d86517773a9e9aa53c7688470f34472c40ce3078d28f6cc025b56d5417916eba377587b9abd45943f5459f9029e7bf1f2db3ad2612a1e372c9

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

@@ -17,6 +17,12 @@ module Instana
       def setup
         @delegate = if ENV.key?('_HANDLER')
                       ServerlessAgent.new([Snapshot::LambdaFunction.new])
+                    elsif ENV.key?('K_REVISION') && ENV.key?('INSTANA_ENDPOINT_URL')
+                      ServerlessAgent.new([
+                                            Snapshot::GoogleCloudRunProcess.new,
+                                            Snapshot::GoogleCloudRunInstance.new,
+                                            Snapshot::RubyProcess.new
+                                          ])
                     elsif @fargate_metadata_uri && ENV.key?('INSTANA_ENDPOINT_URL')
                       ServerlessAgent.new(fargate_snapshots)
                     else

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

@@ -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/setup.rb

@@ -24,6 +24,8 @@ require 'instana/snapshot/fargate_task'
 require 'instana/snapshot/fargate_container'
 require 'instana/snapshot/docker_container'
 require 'instana/snapshot/lambda_function'
+require 'instana/snapshot/google_cloud_run_instance'
+require 'instana/snapshot/google_cloud_run_process'
 
 require 'instana/backend/host_agent_lookup'
 require 'instana/backend/host_agent_activation_observer'

data/lib/instana/snapshot/google_cloud_run_instance.rb

@@ -0,0 +1,69 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Snapshot
+    # @since 1.199
+    class GoogleCloudRunInstance
+      ID = 'com.instana.plugin.gcp.run.revision.instance'.freeze
+
+      def initialize(metadata_uri: 'http://metadata.google.internal')
+        @metadata_uri = URI(metadata_uri)
+        @client = Backend::RequestClient.new(@metadata_uri.host, @metadata_uri.port, use_ssl: @metadata_uri.scheme == "https")
+      end
+
+      def entity_id
+        lookup('/computeMetadata/v1/instance/id')
+      end
+
+      def data
+        {
+          runtime: 'ruby',
+          region: gcp_region,
+          service: ENV['K_SERVICE'],
+          configuration: ENV['K_CONFIGURATION'],
+          revision: ENV['K_REVISION'],
+          instanceId: entity_id,
+          port: ENV['PORT'],
+          numericProjectId: lookup('/computeMetadata/v1/project/numeric-project-id'),
+          projectId: lookup('/computeMetadata/v1/project/project-id')
+        }.compact
+      end
+
+      def snapshot
+        {
+          name: ID,
+          entityId: entity_id,
+          data: data
+        }
+      end
+
+      def source
+        {
+          hl: true,
+          cp: 'gcp',
+          e: entity_id
+        }
+      end
+
+      def host_name
+        "gcp:cloud-run:revision:#{ENV['K_REVISION']}"
+      end
+
+      private
+
+      def gcp_region
+        lookup('/computeMetadata/v1/instance/zone').split('/').last
+      end
+
+      def lookup(resource)
+        path = @metadata_uri.path + resource
+        response = @client.send_request('GET', path, nil, {'Metadata-Flavor' => 'Google'})
+
+        raise "Unable to get `#{path}`. Got `#{response.code}` `#{response['location']}`." unless response.ok?
+
+        response.body
+      end
+    end
+  end
+end

data/lib/instana/snapshot/google_cloud_run_process.rb

@@ -0,0 +1,58 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Snapshot
+    # @since 1.199.0
+    class GoogleCloudRunProcess
+      ID = 'com.instana.plugin.process'.freeze
+
+      def initialize(metadata_uri: 'http://metadata.google.internal')
+        @metadata_uri = URI(metadata_uri)
+        @client = Backend::RequestClient.new(@metadata_uri.host, @metadata_uri.port, use_ssl: @metadata_uri.scheme == "https")
+        @start_time = Time.now
+      end
+
+      def entity_id
+        Process.pid.to_s
+      end
+
+      def data
+        proc_table = Sys::ProcTable.ps(pid: Process.pid)
+        process = Backend::ProcessInfo.new(proc_table)
+
+        {
+          pid: process.pid.to_i,
+          env: ENV.to_h,
+          exec: process.name,
+          args: process.arguments,
+          user: process.uid,
+          group: process.gid,
+          start: @start_time.to_i * 1000,
+          containerType: 'gcpCloudRunInstance',
+          container: lookup('/computeMetadata/v1/instance/id'),
+          "com.instana.plugin.host.name": "gcp:cloud-run:revision:#{ENV['K_REVISION']}"
+        }
+      end
+
+      def snapshot
+        {
+          name: ID,
+          entityId: entity_id,
+          data: data
+        }
+      end
+
+      private
+
+      def lookup(resource)
+        path = @metadata_uri.path + resource
+        response = @client.send_request('GET', path, nil, {'Metadata-Flavor' => 'Google'})
+
+        raise "Unable to get `#{path}`. Got `#{response.code}` `#{response['location']}`." unless response.ok?
+
+        response.body
+      end
+    end
+  end
+end

data/lib/instana/version.rb

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

data/test/backend/agent_test.rb

@@ -56,6 +56,19 @@ class AgentTest < Minitest::Test
     ENV['INSTANA_ENDPOINT_URL'] = nil
   end
 
+  def test_google_cloud
+    ENV['K_REVISION'] = 'TEST'
+    ENV['INSTANA_ENDPOINT_URL'] = 'http://example.com'
+
+    subject = Instana::Backend::Agent.new
+    assert_nil subject.delegate
+    subject.setup
+    assert subject.delegate.is_a?(Instana::Backend::ServerlessAgent)
+  ensure
+    ENV['K_REVISION'] = nil
+    ENV['INSTANA_ENDPOINT_URL'] = nil
+  end
+
   def test_delegate_super
     subject = Instana::Backend::Agent.new
     assert_raises NoMethodError do

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

data/test/snapshot/google_cloud_run_instance_test.rb

@@ -0,0 +1,74 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class GoogleCloudRunInstanceTest < Minitest::Test
+  def test_snapshot
+    ENV['K_SERVICE'] = 'test_service'
+    ENV['K_CONFIGURATION'] = 'test_config'
+    ENV['K_REVISION'] = 'test_revision'
+    ENV['PORT'] = 'test_port'
+
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/id')
+      .to_return(status: 200, body: 'test_instance_id')
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/zone')
+      .to_return(status: 200, body: 'region/number/test_region')
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/project/numeric-project-id')
+      .to_return(status: 200, body: 'numericProjectId')
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/project/project-id')
+      .to_return(status: 200, body: 'projectId')
+
+    subject = Instana::Snapshot::GoogleCloudRunInstance.new(metadata_uri: 'http://10.10.10.10/')
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::GoogleCloudRunInstance::ID, snapshot[:name]
+    assert_equal 'test_instance_id', snapshot[:entityId]
+
+    assert_equal "ruby", snapshot[:data][:runtime]
+    assert_equal "test_region", snapshot[:data][:region]
+    assert_equal "test_service", snapshot[:data][:service]
+    assert_equal "test_config", snapshot[:data][:configuration]
+    assert_equal "test_revision", snapshot[:data][:revision]
+    assert_equal "test_instance_id", snapshot[:data][:instanceId]
+    assert_equal "test_port", snapshot[:data][:port]
+    assert_equal "numericProjectId", snapshot[:data][:numericProjectId]
+    assert_equal "projectId", snapshot[:data][:projectId]
+  ensure
+    ENV['K_SERVICE'] = nil
+    ENV['K_CONFIGURATION'] = nil
+    ENV['K_REVISION'] = nil
+    ENV['PORT'] = nil
+  end
+
+  def test_snapshot_error
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/id')
+      .to_return(status: 500)
+
+    subject = Instana::Snapshot::GoogleCloudRunInstance.new(metadata_uri: 'http://10.10.10.10/')
+
+    assert_raises do
+      subject.snapshot
+    end
+  end
+
+  def test_source
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/id')
+      .to_return(status: 200, body: 'test_instance_id')
+    subject = Instana::Snapshot::GoogleCloudRunInstance.new(metadata_uri: 'http://10.10.10.10/')
+    source = subject.source
+
+    assert source[:hl]
+    assert_equal 'gcp', source[:cp]
+    assert_equal 'test_instance_id', source[:e]
+  end
+
+  def test_host_name
+    ENV['K_REVISION'] = 'test_revision'
+    subject = Instana::Snapshot::GoogleCloudRunInstance.new(metadata_uri: 'http://10.10.10.10/')
+
+    assert_equal 'gcp:cloud-run:revision:test_revision', subject.host_name
+  ensure
+    ENV['K_REVISION'] = nil
+  end
+end

data/test/snapshot/google_cloud_run_process_test.rb

@@ -0,0 +1,33 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class GoogleCloudRunProcessTest < Minitest::Test
+  def test_snapshot
+    ENV['K_REVISION'] = 'test'
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/id')
+      .to_return(status: 200, body: 'test_instance_id')
+
+    subject = Instana::Snapshot::GoogleCloudRunProcess.new(metadata_uri: 'http://10.10.10.10/')
+    snapshot = subject.snapshot
+
+    assert_equal Instana::Snapshot::GoogleCloudRunProcess::ID, snapshot[:name]
+    assert_equal 'test_instance_id', snapshot[:data][:container]
+    assert_equal 'gcpCloudRunInstance', snapshot[:data][:containerType]
+    assert_equal 'gcp:cloud-run:revision:test', snapshot[:data][:'com.instana.plugin.host.name']
+  ensure
+    ENV['K_REVISION'] = nil
+  end
+
+  def test_snapshot_error
+    stub_request(:get, 'http://10.10.10.10//computeMetadata/v1/instance/id')
+      .to_return(status: 500)
+
+    subject = Instana::Snapshot::GoogleCloudRunProcess.new(metadata_uri: 'http://10.10.10.10/')
+
+    assert_raises do
+      subject.snapshot
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.198.0
+  version: 1.199.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-09 00:00:00.000000000 Z
+date: 2021-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -262,6 +262,8 @@ files:
 - lib/instana/snapshot/fargate_container.rb
 - lib/instana/snapshot/fargate_process.rb
 - lib/instana/snapshot/fargate_task.rb
+- lib/instana/snapshot/google_cloud_run_instance.rb
+- lib/instana/snapshot/google_cloud_run_process.rb
 - lib/instana/snapshot/lambda_function.rb
 - lib/instana/snapshot/ruby_process.rb
 - lib/instana/tracer.rb
@@ -314,6 +316,8 @@ files:
 - test/snapshot/fargate_container_test.rb
 - test/snapshot/fargate_process_test.rb
 - test/snapshot/fargate_task_test.rb
+- test/snapshot/google_cloud_run_instance_test.rb
+- test/snapshot/google_cloud_run_process_test.rb
 - test/snapshot/lambda_function_test.rb
 - test/snapshot/ruby_process_test.rb
 - test/support/apps/active_record/active_record.rb
@@ -386,8 +390,10 @@ test_files:
 - test/snapshot/deltable_test.rb
 - test/snapshot/fargate_task_test.rb
 - test/snapshot/ruby_process_test.rb
+- test/snapshot/google_cloud_run_process_test.rb
 - test/snapshot/lambda_function_test.rb
 - test/snapshot/fargate_container_test.rb
+- test/snapshot/google_cloud_run_instance_test.rb
 - test/backend/host_agent_activation_observer_test.rb
 - test/backend/host_agent_reporting_observer_test.rb
 - test/backend/gc_snapshot_test.rb