instana 1.10.4 → 1.10.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66eea5baa9086f0be88ec5bb7f8502e3cdaafaf7b3b8648571584293fe9b674d
-  data.tar.gz: 3302565c8feac78f09954dedc1df328c62baa0f5f3a0992a5e456124f96920bf
+  metadata.gz: 4751e62607f94443c70c105e839f572c987e66a77a8e9696e7f1c243636b76d9
+  data.tar.gz: fe25a35592728095b475bbe96713b7d560638764844e76b5aef2a58e4a7fbce2
 SHA512:
-  metadata.gz: f89823c2bbf24e4d41ea2756b639910d58ee991ed7144b4c47263f563e2fbd00f08cf4660c629953b9615f2696fa52d74e0f6cf26d95fd63b3b4eed8d8ef1a38
-  data.tar.gz: 8ff69135b822c9027819cbd8bcf3757aba741455587519afc7ecbca4a24a11d4549b103a542de153374ebfe35373cd4ae94b15c73e0bb29f22d8f3049e55caf7
+  metadata.gz: 7b31efdcaafa69880c9040b467ecab26ab2d6a58c04cdec9c9c562ccb69a64e8ccfe1faaf7a984847e080ba3482571f6ffedc4952e7e55e72bbd8bf63b3eb52f
+  data.tar.gz: 699309269433de93a99c24315d964a9c67083f3e029afbedf619579e8a0fc69e31e0f435e481e6f20a209bebd49d617705570e2de79a8602e9f6135d4133fd89

data/README.md

@@ -59,32 +59,11 @@ This Ruby gem provides a simple API for tracing and also supports [OpenTracing](
 
 You can find more documentation covering supported components and minimum versions in the Instana [documentation portal](https://docs.instana.io/ecosystem/ruby/).
 
-## Want End User Monitoring?
+# Want End User Monitoring (EUM)?
 
-Instana provides deep end user monitoring that links server side traces with browser events.  
+Instana provides deep end user monitoring that links server side traces with browser events to give you a complete view from server to browser.
 
-For Ruby templates and views, get your EUM API key from your Instana dashboard and you can call `::Instana::Helpers.eum_snippet('example_api_key_string')` from within your layout file.  This will output
-a small javascript snippet of code to instrument browser events.  It's based on [Weasel](https://github.com/instana/weasel).  Check it out.
-
-As an example for Haml, you could do the following:
-
-```ruby
-%html{ :lang => "en", :xmlns => "http://www.w3.org/1999/xhtml" }
-  %head
-    - if user_signed_in?
-      = raw ::Instana::Helpers.eum_snippet('example_api_key_string', :username => current_user.username)
-    - else
-      = raw ::Instana::Helpers.eum_snippet('example_api_key_string')
-  %body
-```
-Make sure to use the `raw` helper so the javascript isn't interpolated with escape strings.
-
-The optional second argument to `::Instana::Helpers.eum_snippet` is a hash of metadata key/values that will be reported along
-with the browser instrumentation.
-
-![Instana EUM example with metadata](https://s3.amazonaws.com/instana/Instana+Gameface+EUM+with+metadata+2016-12-22+at+15.32.01.png)
-
-See also the [End User Monitoring](https://docs.instana.io/products/website_monitoring/) in the Instana documentation portal.
+See the [End User Monitoring](/products/website_monitoring/#configuration) page for more information.
 
 ## Development
 

data/Rakefile

@@ -27,6 +27,7 @@ Rake::TestTask.new(:test) do |t|
     when /libraries/
       t.test_files = FileList['test/instrumentation/*_test.rb',
                               'test/frameworks/cuba_test.rb',
+                              'test/frameworks/rack_test.rb',
                               'test/frameworks/roda_test.rb',
                               'test/frameworks/sinatra_test.rb']
     else

data/lib/instana/instrumentation/rack.rb

@@ -28,8 +28,12 @@ module Instana
           # Headers are available in this format: HTTP_X_CAPTURE_THIS
           rack_header = 'HTTP_' + custom_header.upcase
           rack_header.tr!('-', '_')
+
           if env.key?(rack_header)
-            kvs["http.#{custom_header}"] = env[rack_header]
+            unless kvs[:http].key?(:header)
+              kvs[:http][:header] = {}
+            end
+            kvs[:http][:header][custom_header.to_sym] = env[rack_header]
           end
         }
       end

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.10.4"
+  VERSION = "1.10.5"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/frameworks/rack_test.rb

@@ -46,6 +46,9 @@ class RackTest < Minitest::Test
     assert first_span.key?(:stack)
     assert_equal 2, first_span[:stack].count
     refute_nil first_span[:stack].first[:c].match(/instana\/instrumentation\/rack.rb/)
+
+    # Restore to default
+    ::Instana.config[:collect_backtraces] = false
   end
 
   def test_basic_get_with_custom_service_name
@@ -164,4 +167,34 @@ class RackTest < Minitest::Test
 
     assert last_response.ok?
   end
+
+  def test_custom_headers_capture
+    clear_all!
+    ::Instana.config[:collect_backtraces] = true
+    ::Instana.agent.extra_headers = %w(X-Capture-This X-Capture-That)
+
+    get '/mrlobster', {}, { "HTTP_X_CAPTURE_THIS" => "ThereYouGo" }
+    assert last_response.ok?
+    assert_equal "ThereYouGo", last_request.env["HTTP_X_CAPTURE_THIS"]
+
+    spans = ::Instana.processor.queued_spans
+
+    # Span validation
+    assert_equal 1, spans.count
+    first_span = spans.first
+
+    assert first_span[:data][:http].key?(:header)
+    assert first_span[:data][:http][:header].key?(:"X-Capture-This")
+    assert !first_span[:data][:http][:header].key?(:"X-Capture-That")
+    assert_equal "ThereYouGo", first_span[:data][:http][:header][:"X-Capture-This"]
+
+    # Backtrace fingerprint validation
+    assert first_span.key?(:stack)
+    assert_equal 2, first_span[:stack].count
+    refute_nil first_span[:stack].first[:c].match(/instana\/instrumentation\/rack.rb/)
+
+    # Restore to default
+    ::Instana.config[:collect_backtraces] = false
+    ::Instana.agent.extra_headers = nil
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.4
+  version: 1.10.5
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-17 00:00:00.000000000 Z
+date: 2019-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler