sinatra_test.rb in instana-1.11.7

- old
+ new

@@ -1,6 +1,6 @@
-
+require 'sinatra'
 if defined?(::Sinatra)
   require 'test_helper'
   require File.expand_path(File.dirname(__FILE__) + '/../apps/sinatra')
   require 'rack/test'
 
@@ -15,30 +15,38 @@
       clear_all!
 
       r = get '/'
       assert last_response.ok?
 
-      assert r.headers.key?("X-Instana-T")
-      assert r.headers.key?("X-Instana-S")
 
       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)
+      rack_span = spans.first
+      assert_equal :rack, rack_span[:n]
+      # ::Instana::Util.pry!
 
-      assert first_span[:data][:http].key?(:method)
-      assert_equal "GET", first_span[:data][:http][:method]
+      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 first_span[:data][:http].key?(:url)
-      assert_equal "/", first_span[:data][:http][:url]
+      assert rack_span[:data][:http].key?(:url)
+      assert_equal "/", rack_span[:data][:http][:url]
 
-      assert first_span[:data][:http].key?(:status)
-      assert_equal 200, first_span[:data][:http][:status]
+      assert rack_span[:data][:http].key?(:status)
+      assert_equal 200, rack_span[:data][:http][:status]
 
-      assert first_span[:data][:http].key?(:host)
-      assert_equal "example.org", first_span[:data][:http][:host]
+      assert rack_span[:data][:http].key?(:host)
+      assert_equal "example.org", rack_span[:data][:http][:host]
     end
   end
 end