instana 1.198.0 → 1.199.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0dca649979bd82548097afd526fd4258ffd43b08255a412e273eb35741b08e09
-  data.tar.gz: 5565917d5389fd564caa3146df077617e58447d981fcc09958ea7fa4aff5c6d4
+  metadata.gz: 86a3e023781d52d3b5efd25c9b5d304520dd3c88aecde954c326bd736abae787
+  data.tar.gz: b6c7bf11431925b9a48b827b5adbb52d93cb1f1f44bde1ebef98bd89f2188cb0
 SHA512:
-  metadata.gz: c71f8804c226548e29b05cb2ba69a207f71bf9a67d97d879269316c1267c8abf0faaf74b06fe4514d15427ff3e0fb16575e1d3101e5f0f7d0e26c9c7275fdde0
-  data.tar.gz: feafba3def0b0321d38944061c3577e4d77bfb6bde9f6b927bfe201f55889c511f407b5d8de248c50c25f109aea22a46cede3089bf3db7931ac7b6768d73509b
+  metadata.gz: e2045faa632b6edc00e4dba26feb69d5249c755698a0dac2adeaa0e2b1cbe65f7f37682f7b59a1d3d000f8908dbee85c4f0356da333f02e874361b5861cfcc3f
+  data.tar.gz: e1b3983ace1be9653732b033902c7f59a74dce020ebfb585e02cf3dfdd1c2e7eb50df4cff9ff4eb8467df3a57b3208165efe659d97073bd6bc97f9e2bdd62fa0

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/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.0"
   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/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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.198.0
+  version: 1.199.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
@@ -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