instana 1.197.0.pre1 → 1.199.0

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

data/test/snapshot/lambda_function_test.rb

@@ -0,0 +1,37 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class LambdaFunctionTest < Minitest::Test
+  def setup
+    @subject = Instana::Snapshot::LambdaFunction.new
+  end
+
+  def test_snapshot
+    Thread.current[:instana_function_arn] = 'test'
+
+    assert_equal Instana::Snapshot::LambdaFunction::ID, @subject.snapshot[:name]
+    assert_equal Thread.current[:instana_function_arn], @subject.snapshot[:entityId]
+  ensure
+    Thread.current[:instana_function_arn] = nil
+  end
+
+  def test_source
+    Thread.current[:instana_function_arn] = 'test'
+
+    assert @subject.source[:hl]
+    assert_equal 'aws', @subject.source[:cp]
+    assert_equal Thread.current[:instana_function_arn], @subject.source[:e]
+  ensure
+    Thread.current[:instana_function_arn] = nil
+  end
+
+  def test_host_name
+    Thread.current[:instana_function_arn] = 'test'
+
+    assert_equal Thread.current[:instana_function_arn], @subject.host_name
+  ensure
+    Thread.current[:instana_function_arn] = nil
+  end
+end

data/test/test_helper.rb

@@ -45,7 +45,7 @@ require 'fakefs/safe'
 require 'webmock/minitest'
 # Webmock: Whitelist local IPs
 WebMock.disable_net_connect!(
-  allow: ->(uri) { %w[localhost 127.0.0.1 172.17.0.1 172.0.12.100].include?(uri.host) }
+  allow: ->(uri) { %w[localhost 127.0.0.1 172.17.0.1 172.0.12.100].include?(uri.host) && ENV.key?('APPRAISAL_INITIALIZED') }
 )
 
 Dir['test/support/*.rb'].each { |f| load(f) }

data/test/tracing/id_management_test.rb

@@ -68,6 +68,10 @@ class TracerIDMgmtTest < Minitest::Test
     # Bogus Array arg
     bogus_result = Instana::Util.header_to_id([1234])
     assert_equal '', bogus_result
+
+    # Invalid characters/length
+    bogus_result = Instana::Util.header_to_id('qwerty')
+    assert_equal '', bogus_result
   end
 
   def test_long_id_trim

data/test/tracing/span_context_test.rb

@@ -11,12 +11,12 @@ class SpanContextTest < Minitest::Test
 
   def test_invalid
     subject = Instana::SpanContext.new(nil, nil)
-    assert subject.trace_parent_header.empty?
-    assert subject.trace_state_header.empty?
+    refute subject.valid?
   end
 
   def test_flags_level_zero
-    subject = Instana::SpanContext.new('trace', 'span', 0)
+    subject = Instana::SpanContext.new('trace', 'span', 0, {external_state: 'cn=test'})
     assert_equal '00-000000000000000000000000000trace-000000000000span-00', subject.trace_parent_header
+    assert_equal 'cn=test', subject.trace_state_header
   end
 end

data/test/tracing/span_test.rb

@@ -46,6 +46,15 @@ class SpanTest < Minitest::Test
     assert_equal 'test', span.trace_id
   end
 
+  def test_span_from_contetx_invalid
+    context = Instana::SpanContext.new(nil, nil, 1)
+    span = Instana::Span.new(:test, parent_ctx: context)
+
+    assert_nil span.parent_id
+    refute_equal context.span_id, span.trace_id
+    assert_equal 1, span.context.level
+  end
+
   def test_span_collect_backtraces
     Instana.config[:collect_backtraces] = true
     span = Instana::Span.new(:excon)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.197.0.pre1
+  version: 1.199.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2021-04-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -255,12 +255,16 @@ files:
 - lib/instana/open_tracing/instana_tracer.rb
 - lib/instana/rack.rb
 - lib/instana/secrets.rb
+- lib/instana/serverless.rb
 - lib/instana/setup.rb
 - lib/instana/snapshot/deltable.rb
 - lib/instana/snapshot/docker_container.rb
 - 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
 - lib/instana/tracing/processor.rb
@@ -306,11 +310,15 @@ files:
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/secrets_test.rb
+- test/serverless_test.rb
 - test/snapshot/deltable_test.rb
 - test/snapshot/docker_container_test.rb
 - 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
 - test/support/apps/grpc/boot.rb
@@ -357,9 +365,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.6
 signing_key: 
@@ -367,6 +375,7 @@ specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
 - test/config_test.rb
+- test/serverless_test.rb
 - test/activator_test.rb
 - test/tracing/span_context_test.rb
 - test/tracing/span_test.rb
@@ -381,7 +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