instana 1.193.2 → 1.193.6

data/test/frameworks/roda_test.rb

@@ -1,58 +1,60 @@
 
-if defined?(::Roda)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/roda')
-  require 'rack/test'
 
-  class RodaTest < Minitest::Test
-    include Rack::Test::Methods
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
 
-    def app
-      InstanaRodaApp
-    end
+require 'test_helper'
+require 'rack/test'
 
-    def test_basic_get
-      clear_all!
+class RodaTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/roda/config.ru').first
 
-      r = get '/hello'
-      assert last_response.ok?
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
+
+    r = get '/hello'
+    assert last_response.ok?
 
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers.key?("X-Instana-S")
+    assert r.headers.key?("X-Instana-T")
+    assert r.headers.key?("X-Instana-S")
 
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
 
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert first_span.key?(:data)
-      assert first_span[:data].key?(:http)
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert first_span.key?(:data)
+    assert first_span[:data].key?(:http)
 
-      assert first_span[:data][:http].key?(:method)
-      assert_equal "GET", first_span[:data][:http][:method]
+    assert first_span[:data][:http].key?(:method)
+    assert_equal "GET", first_span[:data][:http][:method]
 
-      assert first_span[:data][:http].key?(:url)
-      assert_equal "/hello", first_span[:data][:http][:url]
+    assert first_span[:data][:http].key?(:url)
+    assert_equal "/hello", first_span[:data][:http][:url]
 
-      assert first_span[:data][:http].key?(:status)
-      assert_equal 200, first_span[:data][:http][:status]
+    assert first_span[:data][:http].key?(:status)
+    assert_equal 200, first_span[:data][:http][:status]
+
+    assert first_span[:data][:http].key?(:host)
+    assert_equal "example.org", first_span[:data][:http][:host]
+  end
 
-      assert first_span[:data][:http].key?(:host)
-      assert_equal "example.org", first_span[:data][:http][:host]
-    end
-    
-    def test_path_template
-      clear_all!
+  def test_path_template
+    clear_all!
 
-      r = get '/greet/instana'
-      assert last_response.ok?
+    r = get '/greet/instana'
+    assert last_response.ok?
 
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
 
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert_equal '/greet/{name}', first_span[:data][:http][:path_tpl]
-    end
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal '/greet/{name}', first_span[:data][:http][:path_tpl]
   end
 end

data/test/frameworks/sinatra_test.rb

@@ -1,66 +1,66 @@
-require 'sinatra'
-if defined?(::Sinatra)
-  require 'test_helper'
-  require File.expand_path(File.dirname(__FILE__) + '/../apps/sinatra')
-  require 'rack/test'
-
-  class SinatraTest < Minitest::Test
-    include Rack::Test::Methods
-
-    def app
-      InstanaSinatraApp
-    end
-
-    def test_basic_get
-      clear_all!
-
-      r = get '/'
-      assert last_response.ok?
-
-
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
-
-      rack_span = spans.first
-      assert_equal :rack, rack_span[:n]
-      # ::Instana::Util.pry!
-
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers["X-Instana-T"] == ::Instana::Util.id_to_header(rack_span[:t])
-      assert r.headers.key?("X-Instana-S")
-      assert r.headers["X-Instana-S"] == ::Instana::Util.id_to_header(rack_span[:s])
-      assert r.headers.key?("X-Instana-L")
-      assert r.headers["X-Instana-L"] == '1'
-      assert r.headers.key?("Server-Timing")
-      assert r.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
-      
-      assert rack_span.key?(:data)
-      assert rack_span[:data].key?(:http)
-      assert rack_span[:data][:http].key?(:method)
-      assert_equal "GET", rack_span[:data][:http][:method]
-
-      assert rack_span[:data][:http].key?(:url)
-      assert_equal "/", rack_span[:data][:http][:url]
-
-      assert rack_span[:data][:http].key?(:status)
-      assert_equal 200, rack_span[:data][:http][:status]
-
-      assert rack_span[:data][:http].key?(:host)
-      assert_equal "example.org", rack_span[:data][:http][:host]
-    end
-    
-    def test_path_template
-      clear_all!
-
-      r = get '/greet/instana'
-      assert last_response.ok?
-
-      spans = ::Instana.processor.queued_spans
-      assert_equal 1, spans.count
-
-      first_span = spans.first
-      assert_equal :rack, first_span[:n]
-      assert_equal '/greet/:name', first_span[:data][:http][:path_tpl]
-    end
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
+require 'test_helper'
+require 'rack/test'
+
+class SinatraTest < Minitest::Test
+  include Rack::Test::Methods
+  APP = Rack::Builder.parse_file('test/support/apps/sinatra/config.ru').first
+
+  def app
+    APP
+  end
+
+  def test_basic_get
+    clear_all!
+
+    r = get '/'
+    assert last_response.ok?
+
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    rack_span = spans.first
+    assert_equal :rack, rack_span[:n]
+    # ::Instana::Util.pry!
+
+    assert r.headers.key?("X-Instana-T")
+    assert r.headers["X-Instana-T"] == ::Instana::Util.id_to_header(rack_span[:t])
+    assert r.headers.key?("X-Instana-S")
+    assert r.headers["X-Instana-S"] == ::Instana::Util.id_to_header(rack_span[:s])
+    assert r.headers.key?("X-Instana-L")
+    assert r.headers["X-Instana-L"] == '1'
+    assert r.headers.key?("Server-Timing")
+    assert r.headers["Server-Timing"] == "intid;desc=#{::Instana::Util.id_to_header(rack_span[:t])}"
+
+    assert rack_span.key?(:data)
+    assert rack_span[:data].key?(:http)
+    assert rack_span[:data][:http].key?(:method)
+    assert_equal "GET", rack_span[:data][:http][:method]
+
+    assert rack_span[:data][:http].key?(:url)
+    assert_equal "/", rack_span[:data][:http][:url]
+
+    assert rack_span[:data][:http].key?(:status)
+    assert_equal 200, rack_span[:data][:http][:status]
+
+    assert rack_span[:data][:http].key?(:host)
+    assert_equal "example.org", rack_span[:data][:http][:host]
+  end
+
+  def test_path_template
+    clear_all!
+
+    r = get '/greet/instana'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal :rack, first_span[:n]
+    assert_equal '/greet/:name', first_span[:data][:http][:path_tpl]
   end
 end

data/test/instana_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class InstanaTest < Minitest::Test

data/test/instrumentation/aws_test.rb

@@ -0,0 +1,33 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class AwsTest < Minitest::Test
+  def test_dynamo_db
+    dynamo = Aws::DynamoDB::Client.new(
+      region: "local",
+      access_key_id: "placeholder",
+      secret_access_key: "placeholder",
+      endpoint: "http://localhost:8000"
+    )
+
+    assert_raises Aws::DynamoDB::Errors::ResourceNotFoundException do
+      Instana::Tracer.start_or_continue_trace(:dynamo_test, {}) do
+        dynamo.get_item(
+          table_name: 'sample_table',
+          key: { s: 'sample_item' }
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    dynamo_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], dynamo_span[:p]
+    assert_equal :dynamodb, dynamo_span[:n]
+    assert_equal :get_item, dynamo_span[:data][:op]
+    assert_equal 'sample_table', dynamo_span[:data][:table]
+  end
+end

data/test/instrumentation/dalli_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 
 class DalliTest < Minitest::Test

data/test/instrumentation/excon_test.rb

@@ -1,4 +1,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class ExconTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/graphql_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 
 class GraphqlTest < Minitest::Test

data/test/instrumentation/grpc_test.rb

@@ -1,4 +1,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
+require 'support/apps/grpc/boot'
 
 class GrpcTest < Minitest::Test
   def client_stub
@@ -225,7 +229,7 @@ class GrpcTest < Minitest::Test
     server_span = find_spans_by_name(spans, :'rpc-server').first
 
     validate_sdk_span(sdk_span)
-    
+
     assert_client_span(
         client_span,
         call: '/PingPongService/FailToPing',

data/test/instrumentation/{net-http_test.rb → net_http_test.rb}

@@ -1,4 +1,8 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class NetHTTPTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/{instrumented_request_test.rb → rack_instrumented_request_test.rb}

@@ -1,6 +1,9 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 
-class InstrumentedRequestTest < Minitest::Test
+class RackInstrumentedRequestTest < Minitest::Test
   def test_skip_trace_with_header
     req = Instana::InstrumentedRequest.new(
       'HTTP_X_INSTANA_L' => '0;sample-data'

data/test/{frameworks → instrumentation}/rack_test.rb

@@ -1,7 +1,9 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 require 'rack/test'
 require 'rack/lobster'
-require "instana/rack"
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods

data/test/instrumentation/rails_action_cable_test.rb

@@ -0,0 +1,131 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+require 'rails'
+require 'action_cable'
+
+require 'ostruct'
+require 'logger'
+
+class RailsActionCableTest < Minitest::Test
+  def setup
+    skip unless defined?(::ActionCable::Connection::Base)
+  end
+
+  def test_transmit_no_parent
+    clear_all!
+
+    connection = mock_connection
+    channel_klass = Class.new(ActionCable::Channel::Base)
+
+    channel_klass
+      .new(connection, :test)
+      .send(:transmit, 'action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert channel_klass.to_s, data[:rpc][:call]
+    assert :transmit, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_transmit_parent
+    clear_all!
+
+    connection = mock_connection
+    connection.instance_variable_set(
+      :@instana_trace_context,
+      Instana::SpanContext.new('ABC', 'ABC')
+    )
+    channel_klass = Class.new(ActionCable::Channel::Base)
+
+    channel_klass
+      .new(connection, :test)
+      .send(:transmit, 'action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert 'ABC', span[:t]
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert channel_klass.to_s, data[:rpc][:call]
+    assert :transmit, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_action_no_parent
+    clear_all!
+
+    connection = mock_connection
+    channel_klass = Class.new(ActionCable::Channel::Base) do
+      def sample
+        raise unless Instana.tracer.tracing?
+      end
+    end
+
+    channel_klass
+      .new(connection, :test)
+      .perform_action('action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert "#{channel_klass}#sample", data[:rpc][:call]
+    assert :action, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  def test_action_parent
+    clear_all!
+
+    connection = mock_connection
+    connection.instance_variable_set(
+      :@instana_trace_context,
+      Instana::SpanContext.new('ABC', 'ABC')
+    )
+    channel_klass = Class.new(ActionCable::Channel::Base) do
+      def sample
+        raise unless Instana.tracer.tracing?
+      end
+    end
+
+    channel_klass
+      .new(connection, :test)
+      .perform_action('action' => 'sample')
+
+    span, rest = Instana.processor.queued_spans
+    data = span[:data]
+
+    assert_nil rest
+    assert 'ABC', span[:t]
+    assert :"rpc-server", span[:n]
+    assert :actioncable, data[:rpc][:flavor]
+    assert "#{channel_klass}#sample", data[:rpc][:call]
+    assert :action, data[:rpc][:call_type]
+    assert Socket.gethostname, data[:rpc][:host]
+  end
+
+  private
+
+  def mock_connection
+    server = OpenStruct.new(
+      logger: Logger.new('/dev/null'),
+      worker_pool: nil,
+      config: OpenStruct.new(log_tags: [])
+    )
+    connection = ActionCable::Connection::Base.new(server, {})
+    connection.define_singleton_method(:transmit) { |*_args| true }
+    connection
+  end
+end