instana 1.13.0 → 1.193.3

data/test/frameworks/sinatra_test.rb

@@ -1,66 +1,63 @@
-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
+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/instrumentation/excon_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class ExconTest < Minitest::Test
   def test_config_defaults
@@ -116,8 +117,6 @@ class ExconTest < Minitest::Test
     assert_equal 3, rack_spans.length
     assert_equal 3, excon_spans.length
 
-    # ::Instana::Util.pry!
-
     for rack_span in rack_spans
       # data keys/values
       refute_nil rack_span.key?(:data)

data/test/instrumentation/graphql_test.rb

@@ -0,0 +1,116 @@
+require 'test_helper'
+
+class GraphqlTest < Minitest::Test
+  class TaskType < GraphQL::Schema::Object
+    field :id, ID, null: false
+    field :action, String, null: false
+  end
+  
+  class NewTaskType < GraphQL::Schema::Mutation
+    argument :action, String, required: true
+    field :task, TaskType, null: true
+    
+    def resolve(action:)
+      {
+        task: OpenStruct.new(id: '0', action: action)
+      }
+    end
+  end
+  
+  class QueryType < GraphQL::Schema::Object
+    field :tasks, TaskType.connection_type, null: false
+    
+    def tasks()
+      [
+        OpenStruct.new(id: '0', action: 'Sample')
+      ]
+    end
+  end
+  
+  class MutationType < GraphQL::Schema::Object
+    field :create_task, mutation: NewTaskType
+  end
+  
+  class Schema < GraphQL::Schema
+    query QueryType
+    mutation MutationType
+  end
+  
+  def test_it_works
+    assert defined?(GraphQL)
+  end
+  
+  def test_config_defaults    
+    assert ::Instana.config[:graphql].is_a?(Hash)
+    assert ::Instana.config[:graphql].key?(:enabled)
+    assert_equal true, ::Instana.config[:graphql][:enabled]
+  end
+  
+  def test_query
+    clear_all!
+    
+    query = "query Sample {
+      tasks(after: \"\", first: 10) {
+        nodes {
+          action
+        }
+      }
+    }"
+    
+    expected_data = {
+      :operationName => "Sample",
+      :operationType => "query",
+      :arguments => { "tasks" => ["after", "first"] },
+      :fields => { "tasks" => ["nodes"], "nodes" => ["action"] }
+    }
+    expected_results = {
+      "data" => {
+        "tasks" => { 
+          "nodes" => [{ "action" => "Sample" }]
+        }
+      }
+    }
+    
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+    
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+  
+  def test_mutation
+    clear_all!
+    
+    query = "mutation Sample {
+      createTask(action: \"Sample\") {
+        task {
+          action
+        }
+      }
+    }"
+    
+    expected_data = {
+      :operationName => "Sample",
+      :operationType => "mutation",
+      :arguments => { "createTask" => ["action"] },
+      :fields => { "createTask" => ["task"], "task" => ["action"] }
+    }
+    expected_results = {
+      "data" => {
+        "createTask" => { 
+          "task" => { "action" => "Sample" }
+        }
+      }
+    }
+    
+    results = Instana.tracer.start_or_continue_trace('graphql-test') { Schema.execute(query) }
+    query_span, root_span = *Instana.processor.queued_spans
+        
+    assert_equal expected_results, results.to_h
+    assert_equal :sdk, root_span[:n]
+    assert_equal :'graphql.server', query_span[:n]
+    assert_equal expected_data, query_span[:data][:graphql]
+  end
+end

data/test/instrumentation/grpc_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require 'support/apps/grpc/boot'
 
 class GrpcTest < Minitest::Test
   def client_stub
@@ -225,7 +226,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,5 @@
 require 'test_helper'
+require 'support/apps/http_endpoint/boot'
 
 class NetHTTPTest < Minitest::Test
   def test_config_defaults

data/test/instrumentation/rack_instrumented_request_test.rb

@@ -0,0 +1,84 @@
+require 'test_helper'
+
+class RackInstrumentedRequestTest < Minitest::Test
+  def test_skip_trace_with_header
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert req.skip_trace?
+  end
+
+  def test_skip_trace_without_header
+    req = Instana::InstrumentedRequest.new({})
+
+    refute req.skip_trace?
+  end
+
+  def test_incomming_context
+    id = Instana::Util.generate_id
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1',
+      'HTTP_X_INSTANA_T' => id,
+      'HTTP_X_INSTANA_S' => id
+    )
+
+    expected = {
+      trace_id: id,
+      span_id: id,
+      level: '1'
+    }
+
+    assert_equal expected, req.incoming_context
+  end
+
+  def test_request_tags
+    ::Instana.agent.extra_headers = %w[X-Capture-This]
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_HOST' => 'example.com',
+      'REQUEST_METHOD' => 'GET',
+      'HTTP_X_CAPTURE_THIS' => 'that',
+      'PATH_INFO' => '/'
+    )
+
+    expected = {
+      method: 'GET',
+      url: '/',
+      host: 'example.com',
+      header: {
+        "X-Capture-This": 'that'
+      }
+    }
+
+    assert_equal expected, req.request_tags
+    ::Instana.agent.extra_headers = nil
+  end
+
+  def test_correlation_data_valid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1,correlationType=web ;correlationId=1234567890abcdef'
+    )
+    expected = {
+      type: 'web',
+      id: '1234567890abcdef'
+    }
+
+    assert_equal expected, req.correlation_data
+  end
+
+  def test_correlation_data_invalid
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '0;sample-data'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+
+  def test_correlation_data_legacy
+    req = Instana::InstrumentedRequest.new(
+      'HTTP_X_INSTANA_L' => '1'
+    )
+
+    assert_equal({}, req.correlation_data)
+  end
+end

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

@@ -1,11 +1,10 @@
 require 'test_helper'
 require 'rack/test'
 require 'rack/lobster'
-require "instana/rack"
 
 class RackTest < Minitest::Test
   include Rack::Test::Methods
-  
+
   class PathTemplateApp
     def call(env)
       env['INSTANA_HTTP_PATH_TEMPLATE'] = 'sample_template'
@@ -57,11 +56,7 @@ class RackTest < Minitest::Test
     assert rack_span[:f].key?(:e)
     assert rack_span[:f].key?(:h)
     assert_equal ::Instana.agent.agent_uuid, rack_span[:f][:h]
-
-    # Backtrace fingerprint validation
-    assert rack_span.key?(:stack)
-    assert_equal 2, rack_span[:stack].count
-    refute_nil rack_span[:stack].first[:c].match(/instana\/instrumentation\/rack.rb/)
+    assert !rack_span.key?(:stack)
 
     # Restore to default
     ::Instana.config[:collect_backtraces] = false
@@ -151,8 +146,9 @@ class RackTest < Minitest::Test
 
   def test_context_continuation
     clear_all!
-    header 'X-INSTANA-T', Instana::Util.id_to_header(1234)
-    header 'X-INSTANA-S', Instana::Util.id_to_header(4321)
+    continuation_id = Instana::Util.generate_id
+    header 'X-INSTANA-T', continuation_id
+    header 'X-INSTANA-S', continuation_id
 
     get '/mrlobster'
     assert last_response.ok?
@@ -186,10 +182,30 @@ class RackTest < Minitest::Test
     # Context validation
     # The first span should have the passed in trace ID
     # and specify the passed in span ID as it's parent.
-    assert_equal 1234, rack_span[:t]
-    assert_equal 4321, rack_span[:p]
+    assert_equal continuation_id, rack_span[:t]
+    assert_equal continuation_id, rack_span[:p]
   end
 
+  def test_correlation_information
+    clear_all!
+
+    header 'X-INSTANA-L', '1,correlationType=test;correlationId=abcdefh123'
+
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+
+    # Span validation
+    assert_equal 1, spans.count
+    rack_span = spans.first
+    assert_equal :rack, rack_span[:n]
+
+    assert_equal 'abcdefh123', rack_span[:crid]
+    assert_equal 'test', rack_span[:crtp]
+  end
+
+
   def test_instana_response_headers
     clear_all!
     get '/mrlobster'
@@ -233,26 +249,22 @@ class RackTest < Minitest::Test
     assert rack_span[:data][:http][:header].key?(:"X-Capture-This")
     assert !rack_span[:data][:http][:header].key?(:"X-Capture-That")
     assert_equal "ThereYouGo", rack_span[:data][:http][:header][:"X-Capture-This"]
-
-    # Backtrace fingerprint validation
-    assert rack_span.key?(:stack)
-    assert_equal 2, rack_span[:stack].count
-    refute_nil rack_span[:stack].first[:c].match(/instana\/instrumentation\/rack.rb/)
+    assert !rack_span.key?(:stack)
 
     # Restore to default
     ::Instana.config[:collect_backtraces] = false
     ::Instana.agent.extra_headers = nil
   end
-  
+
   def test_capture_http_path_template
     clear_all!
-    
+
     get '/path_tpl'
     assert last_response.ok?
-    
+
     spans = ::Instana.processor.queued_spans
     assert_equal 1, spans.length
-    
+
     rack_span = spans.first
     assert_equal :rack, rack_span[:n]
     assert_equal 'sample_template', rack_span[:data][:http][:path_tpl]