instana 1.195.4 → 1.197.0.pre1

data/test/tracing/span_context_test.rb

@@ -0,0 +1,22 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class SpanContextTest < Minitest::Test
+  def test_to_hash
+    subject = Instana::SpanContext.new('trace', 'span')
+    assert_equal({trace_id: 'trace', span_id: 'span'}, subject.to_hash)
+  end
+
+  def test_invalid
+    subject = Instana::SpanContext.new(nil, nil)
+    assert subject.trace_parent_header.empty?
+    assert subject.trace_state_header.empty?
+  end
+
+  def test_flags_level_zero
+    subject = Instana::SpanContext.new('trace', 'span', 0)
+    assert_equal '00-000000000000000000000000000trace-000000000000span-00', subject.trace_parent_header
+  end
+end

data/test/tracing/span_test.rb

@@ -0,0 +1,127 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class SpanTest < Minitest::Test
+  def test_getters_setters
+    span = Instana::Span.new(:test)
+
+    assert_equal span[:s], span.id
+    assert_equal span[:t], span.trace_id
+    assert_equal span[:p], span.parent_id
+    assert_equal span[:d], span.duration
+
+    span.parent_id = 'test'
+    assert_equal 'test', span.parent_id
+
+    span.name = 'test'
+    assert_equal 'test', span[:data][:sdk][:name]
+
+    span[:t] = 'test'
+    assert span.key?(:t)
+    assert_equal 'test', span[:t]
+
+    assert span.inspect
+  end
+
+  def test_builtin_span_rename
+    span = Instana::Span.new(:"net-http")
+    assert_equal :"net-http", span.name
+
+    span.name = 'test'
+    assert_equal 'test', span.name
+  end
+
+  def test_exit_span
+    span = Instana::Span.new(:"net-http")
+    assert span.exit_span?
+  end
+
+  def test_span_from_contetx
+    context = Instana::SpanContext.new('test', 'test', 0)
+    span = Instana::Span.new(:test, parent_ctx: context)
+
+    assert_equal 'test', span.parent_id
+    assert_equal 'test', span.trace_id
+  end
+
+  def test_span_collect_backtraces
+    Instana.config[:collect_backtraces] = true
+    span = Instana::Span.new(:excon)
+    assert span[:stack]
+  ensure
+    Instana.config[:collect_backtraces] = false
+  end
+
+  def test_span_stack_over_limit
+    def inner(depth = 50, &blk) # rubocop:disable Lint/NestedMethodDefinition
+      return blk.call if depth.zero?
+
+      inner(depth - 1, &blk)
+    end
+
+    inner do
+      span = Instana::Span.new(:excon)
+      span.add_stack(limit: 500)
+      assert_equal 40, span[:stack].length
+    end
+  end
+
+  def test_multiple_errors
+    span = Instana::Span.new(:activerecord)
+    span.set_tag(:activerecord, {})
+
+    span.add_error(StandardError.new('Test1'))
+    span.add_error(StandardError.new('Test2'))
+
+    assert_equal 2, span[:ec]
+    assert_equal 'Test2', span[:data][:activerecord][:error]
+  end
+
+  def test_add_error_nil
+    span = Instana::Span.new(:activerecord)
+    span.add_error(nil)
+
+    assert_equal 1, span[:ec]
+  end
+
+  def test_set_tag_merge
+    span = Instana::Span.new(:excon)
+    span.set_tag(1024, {a: 1})
+    span.set_tag(1024, {b: 2})
+
+    assert_equal({'1024' => {a: 1, b: 2}}, span[:data])
+  end
+
+  def test_set_tags_non_hash
+    span = Instana::Span.new(:excon)
+    assert_nil span.set_tags(0)
+  end
+
+  def test_tags_standard
+    span = Instana::Span.new(:excon)
+    span.set_tag(:test, {a: 1})
+
+    assert_equal({test: {a: 1}}, span.tags)
+    assert_equal({a: 1}, span.tags(:test))
+  end
+
+  def test_log_standard
+    span = Instana::Span.new(:excon)
+    span.log(:test, Time.now, a: 1)
+
+    assert_equal({log: {a: 1}}, span.tags)
+  end
+
+  def test_log_error
+    time = Minitest::Mock.new
+    time.expect(:to_f, nil)
+
+    span = Instana::Span.new(:sdk)
+    span.log(:test, time, a: 1)
+
+    assert_equal({}, span.tags)
+    time.verify
+  end
+end

data/test/tracing/tracer_async_test.rb

@@ -198,4 +198,33 @@ class TracerAsyncTest < Minitest::Test
     assert_equal 3, fourth_span[:data][:sdk][:custom][:tags][:entry_kv]
     assert_equal 3, fourth_span[:data][:sdk][:custom][:tags][:exit_kv]
   end
+
+  def test_async_helpers
+    clear_all!
+    ::Instana.tracer.log_start_or_continue(:rack)
+
+    span = ::Instana.tracer.log_async_entry(:async, {})
+    ::Instana.tracer.log_async_info({a: 1}, span)
+    ::Instana.tracer.log_async_error(StandardError.new('Error'), span)
+    ::Instana.tracer.log_async_exit(nil, {}, span)
+
+    spans = ::Instana.processor.queued_spans
+    span, = spans
+
+    assert_equal({a: 1}, span[:data][:sdk][:custom][:tags])
+    assert_equal(1, span[:ec])
+  end
+
+  def test_async_helpers_tag_exit
+    clear_all!
+    ::Instana.tracer.log_start_or_continue(:rack)
+
+    span = ::Instana.tracer.log_async_entry(:async, {})
+    ::Instana.tracer.log_async_exit(nil, {a: 1}, span)
+
+    spans = ::Instana.processor.queued_spans
+    span, = spans
+
+    assert_equal({a: 1}, span[:data][:sdk][:custom][:tags])
+  end
 end

data/test/tracing/tracer_test.rb

@@ -22,7 +22,6 @@ class TracerTest < Minitest::Test
     ::Instana.config[:tracing][:enabled] = true
   end
 
-
   def test_basic_trace_block
     clear_all!
 
@@ -44,9 +43,7 @@ class TracerTest < Minitest::Test
     assert first_span.key?(:data)
     assert_equal 1, first_span[:data][:one]
     assert first_span.key?(:f)
-    assert first_span[:f].key?(:e)
-    assert first_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
+    assert_equal ::Instana.agent.source, first_span[:f]
   end
 
   def test_exotic_tag_types
@@ -75,9 +72,7 @@ class TracerTest < Minitest::Test
     assert first_span[:data].key?(:ipaddr)
     assert first_span[:data][:ipaddr].is_a?(String)
     assert first_span.key?(:f)
-    assert first_span[:f].key?(:e)
-    assert first_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
+    assert_equal ::Instana.agent.source, first_span[:f]
   end
 
   def test_errors_are_properly_propagated
@@ -105,9 +100,7 @@ class TracerTest < Minitest::Test
     assert first_span.key?(:data)
     assert_equal 1, first_span[:data][:one]
     assert first_span.key?(:f)
-    assert first_span[:f].key?(:e)
-    assert first_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, first_span[:f][:h]
+    assert_equal ::Instana.agent.source, first_span[:f]
     assert_equal first_span[:error], true
     assert_equal first_span[:ec], 1
   end
@@ -222,9 +215,7 @@ class TracerTest < Minitest::Test
     assert_equal rack_span[:data][:close_one], 1
 
     assert rack_span.key?(:f)
-    assert rack_span[:f].key?(:e)
-    assert rack_span[:f].key?(:h)
-    assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
+    assert_equal ::Instana.agent.source, rack_span[:f]
 
     assert_equal sdk_span[:n], :sdk
     assert_equal sdk_span[:data][:sdk][:name], :sub_task
@@ -239,7 +230,9 @@ class TracerTest < Minitest::Test
     exception_raised = false
     begin
       ::Instana.tracer.start_or_continue_trace(:test_trace, {:one => 1}) do
-        raise Exception.new("Block exception test error")
+        ::Instana.tracer.trace(:test_trace_two) do
+          raise Exception.new("Block exception test error")
+        end
       end
     rescue Exception
       exception_raised = true
@@ -248,9 +241,9 @@ class TracerTest < Minitest::Test
     assert exception_raised
 
     spans = ::Instana.processor.queued_spans
-    assert_equal 1, spans.length
+    assert_equal 2, spans.length
 
-    sdk_span = spans[0]
+    sdk_span = spans.last
 
     assert_equal sdk_span[:n], :sdk
     assert_equal sdk_span[:data][:sdk][:name], :test_trace
@@ -285,4 +278,77 @@ class TracerTest < Minitest::Test
     assert_equal sdk_span[:ec], 1
     assert_equal sdk_span.key?(:stack), false
   end
+
+  def test_nil_returns
+    clear_all!
+
+    refute ::Instana.tracer.tracing?
+    assert_nil ::Instana.tracer.log_entry(nil)
+    assert_nil ::Instana.tracer.log_info(nil)
+    assert_nil ::Instana.tracer.log_error(nil)
+    assert_nil ::Instana.tracer.log_exit(nil)
+    assert_nil ::Instana.tracer.log_end(nil)
+    assert_nil ::Instana.tracer.log_async_entry(nil, nil)
+    assert_nil ::Instana.tracer.context
+  end
+
+  def test_tracing_span
+    clear_all!
+
+    refute ::Instana.tracer.tracing_span?(:rack)
+    ::Instana.tracer.log_start_or_continue(:rack)
+    assert ::Instana.tracer.tracing_span?(:rack)
+  end
+
+  def test_log_exit_warn_span_name
+    logger = Minitest::Mock.new
+    logger.expect(:warn, true, [String])
+    subject = Instana::Tracer.new(logger: logger)
+
+    subject.log_start_or_continue(:sample)
+    subject.log_exit(:roda)
+
+    logger.verify
+  end
+
+  def test_log_end_warn_span_name
+    clear_all!
+
+    logger = Minitest::Mock.new
+    logger.expect(:warn, true, [String])
+    subject = Instana::Tracer.new(logger: logger)
+
+    subject.log_start_or_continue(:sample)
+    subject.log_end(:roda)
+
+    logger.verify
+  end
+
+  def test_log_entry_span
+    clear_all!
+
+    subject = Instana::Tracer.new
+    span = Instana::Span.new(:rack)
+
+    subject.log_entry(:sample, {}, ::Instana::Util.now_in_ms, span)
+    assert subject.tracing?
+    assert subject.current_span.parent, span
+  end
+
+  def test_log_entry_span_context
+    clear_all!
+
+    subject = Instana::Tracer.new
+    span_context = Instana::SpanContext.new('test', 'test')
+
+    subject.log_entry(:sample, {}, ::Instana::Util.now_in_ms, span_context)
+    assert subject.tracing?
+    assert subject.current_span.context, span_context
+  end
+
+  def test_missing_class_super
+    assert_raises NoMethodError do
+      Instana::Tracer.invalid
+    end
+  end
 end

data/test/util_test.rb

@@ -0,0 +1,10 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class UtilTest < Minitest::Test
+  def test_get_rb_source_error
+    assert_equal({ error: "Only Ruby source files are allowed. (*.rb)" }, Instana::Util.get_rb_source('invalid.txt'))
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.195.4
+  version: 1.197.0.pre1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-24 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,47 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sys-proctable
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
-  type: :runtime
+        version: '0'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: get_process_mem
+  name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: timers
+  name: sys-proctable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.4
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.11
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.11
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.0.11
 description: The Instana gem is a zero configuration tool that will automatically
   collect key metrics and distributed traces from your Ruby processes. Just install
   and go.
@@ -228,23 +214,21 @@ files:
 - lib/instana/activators/sidekiq_client.rb
 - lib/instana/activators/sidekiq_worker.rb
 - lib/instana/activators/sinatra.rb
-- lib/instana/agent.rb
-- lib/instana/agent/helpers.rb
-- lib/instana/agent/hooks.rb
-- lib/instana/agent/tasks.rb
+- lib/instana/backend/agent.rb
+- lib/instana/backend/gc_snapshot.rb
+- lib/instana/backend/host_agent.rb
+- lib/instana/backend/host_agent_activation_observer.rb
+- lib/instana/backend/host_agent_lookup.rb
+- lib/instana/backend/host_agent_reporting_observer.rb
+- lib/instana/backend/process_info.rb
+- lib/instana/backend/request_client.rb
+- lib/instana/backend/serverless_agent.rb
 - lib/instana/base.rb
-- lib/instana/collector.rb
-- lib/instana/collectors/gc.rb
-- lib/instana/collectors/memory.rb
-- lib/instana/collectors/thread.rb
 - lib/instana/config.rb
-- lib/instana/eum/eum-test.js.erb
-- lib/instana/eum/eum.js.erb
 - lib/instana/frameworks/cuba.rb
 - lib/instana/frameworks/rails.rb
 - lib/instana/frameworks/roda.rb
 - lib/instana/frameworks/sinatra.rb
-- lib/instana/helpers.rb
 - lib/instana/instrumentation/action_cable.rb
 - lib/instana/instrumentation/action_controller.rb
 - lib/instana/instrumentation/action_view.rb
@@ -266,23 +250,36 @@ files:
 - lib/instana/instrumentation/shoryuken.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
-- lib/instana/opentracing/carrier.rb
-- lib/instana/opentracing/tracer.rb
+- lib/instana/logger_delegator.rb
+- lib/instana/open_tracing/carrier.rb
+- lib/instana/open_tracing/instana_tracer.rb
 - lib/instana/rack.rb
 - lib/instana/secrets.rb
 - lib/instana/setup.rb
-- lib/instana/thread_local.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/ruby_process.rb
 - lib/instana/tracer.rb
 - lib/instana/tracing/processor.rb
 - lib/instana/tracing/span.rb
 - lib/instana/tracing/span_context.rb
 - lib/instana/util.rb
 - lib/instana/version.rb
-- lib/oj_check.rb
 - lib/opentracing.rb
 - log/.keep
 - test/activator_test.rb
-- test/agent/agent_test.rb
+- test/backend/agent_test.rb
+- test/backend/gc_snapshot_test.rb
+- test/backend/host_agent_activation_observer_test.rb
+- test/backend/host_agent_lookup_test.rb
+- test/backend/host_agent_reporting_observer_test.rb
+- test/backend/host_agent_test.rb
+- test/backend/process_info_test.rb
+- test/backend/request_client_test.rb
+- test/backend/serverless_agent_test.rb
 - test/benchmarks/bench_id_generation.rb
 - test/benchmarks/bench_opentracing.rb
 - test/config_test.rb
@@ -309,6 +306,12 @@ files:
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/secrets_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/ruby_process_test.rb
 - test/support/apps/active_record/active_record.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
@@ -324,12 +327,17 @@ files:
 - test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
 - test/support/apps/sidekiq/worker.rb
 - test/support/helpers.rb
+- test/support/mock_timer.rb
 - test/test_helper.rb
 - test/tracing/custom_test.rb
 - test/tracing/id_management_test.rb
 - test/tracing/opentracing_test.rb
+- test/tracing/processor_test.rb
+- test/tracing/span_context_test.rb
+- test/tracing/span_test.rb
 - test/tracing/tracer_async_test.rb
 - test/tracing/tracer_test.rb
+- test/util_test.rb
 homepage: https://www.instana.com/
 licenses:
 - MIT
@@ -349,9 +357,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.2.6
 signing_key: 
@@ -360,12 +368,29 @@ summary: Ruby Distributed Tracing & Metrics Sensor for Instana
 test_files:
 - test/config_test.rb
 - test/activator_test.rb
+- test/tracing/span_context_test.rb
+- test/tracing/span_test.rb
 - test/tracing/id_management_test.rb
 - test/tracing/tracer_test.rb
 - test/tracing/custom_test.rb
 - test/tracing/opentracing_test.rb
 - test/tracing/tracer_async_test.rb
-- test/agent/agent_test.rb
+- test/tracing/processor_test.rb
+- test/snapshot/docker_container_test.rb
+- test/snapshot/fargate_process_test.rb
+- test/snapshot/deltable_test.rb
+- test/snapshot/fargate_task_test.rb
+- test/snapshot/ruby_process_test.rb
+- test/snapshot/fargate_container_test.rb
+- test/backend/host_agent_activation_observer_test.rb
+- test/backend/host_agent_reporting_observer_test.rb
+- test/backend/gc_snapshot_test.rb
+- test/backend/host_agent_lookup_test.rb
+- test/backend/serverless_agent_test.rb
+- test/backend/process_info_test.rb
+- test/backend/agent_test.rb
+- test/backend/host_agent_test.rb
+- test/backend/request_client_test.rb
 - test/secrets_test.rb
 - test/instrumentation/graphql_test.rb
 - test/instrumentation/sidekiq-client_test.rb
@@ -385,7 +410,9 @@ test_files:
 - test/instrumentation/excon_test.rb
 - test/instrumentation/grpc_test.rb
 - test/instrumentation/aws_test.rb
+- test/util_test.rb
 - test/support/helpers.rb
+- test/support/mock_timer.rb
 - test/support/apps/sidekiq/boot.rb
 - test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
 - test/support/apps/sidekiq/jobs/sidekiq_job_1.rb