instana 0.14.2 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce0309a7d8eace834f73f721b1e3b008562f9a32
-  data.tar.gz: 1ff1ad55ad736c0ef64f1dca370100143f390cbd
+  metadata.gz: b08a1d3bea72c56da148e02e24c9095a49d4c0f6
+  data.tar.gz: efcbc529c115a5dba077b4e590528b32c98698ba
 SHA512:
-  metadata.gz: a65f865e28aea63228d6c4bfce3c7b5eb4ba1bb6dd1370ce6b3e674083c69905879658e23ecb5329afbab03723ee1aca4c7643db7ea3ba71460d6e59fd5059ed
-  data.tar.gz: 5a7b593a95f1f9857f7d6944f0bac2716767b4ec4c720aabd6852e21e20a15d17c841fe862bb715fc47a642062d4053567efa4cfe967ec69b5888c8c183c150c
+  metadata.gz: 72c20b92c83aa59a7e0b21c5eb9127e696f782ddd7b077294adf9185469629e0f7922027e881dd52c717f1ac3c64929ffc04e1bcef2eb2893e59f94ddd2e0e67
+  data.tar.gz: 9d9cd6654f148a0142faeeab2ef9875bdfa2f9d31db700859a1c44e3d3f195c364c99fbc9a0f33342ce8ea4f07c9caf71cb1a63c7100e90f924f471d345cf154

data/.travis.yml

@@ -19,3 +19,7 @@ before_install:
 
 script: "bundle exec rake test"
 
+notifications:
+  slack:
+    rooms:
+      secure: Ae9tJmBO9/sgYWthHRS5uufAf8s6uIMdtmQn+gBkcAXaMWJgt1IAzpIj98Qsg15/lhHS8ezwCe7WIAWC4mM1cnwl/hP195dbgLzF4D2uOjaIXj55ckIIE06jBX1yHapu0vMFSaKwgL4auEEVg4xkehBb9TzLNG/LbExadZQOIkeLdtgU04VrPfDC9pZWPplXT4kzjMZkMESzBYaCfNl6eenu0sHdoxSvngv52MImog6aZQKT+k3ccAa1yzZNhUdy4gSZi1HafXdSCn4UTPDtkNIlsWBW8yprICLxZV/NvgUTEEJYSHO6Ucx9Er22LzKtNbEYlAs1GErGWjDzpqvvXt/5UwNx0rLDrVKI/xMIELEbT047mSgJ8tpVd0ErGA/bnDfbF2oDFTAEXq4jaeAMaVR9Q1CW0ZZF2Jh5jOKc41U+AVGgaMDaBA0ukDSeXvJcnteZ9EllOO8ZAtC2FKtBNnj36W13KTR0TkjMCl+KOiVJXnOyRJIR+CUL9BdDuODBVPZHqZaZ48N+MOG9dRb+fvkdTnwh7hU+UmR08kOsd4x+dDlm4dBrFrB8v8udQ7XuBN9AOZty2CPWFUSJM1BxtetyS3We0L6lQ8o/B9STFNK4KTa/M8wNq1Fm85h3ZKHHIHDpQnXM6vD8SV1p9u91C5UI8rEyxzW5IaT2oqXsCzU=

data/README.md

@@ -58,7 +58,30 @@ You can find more documentation covering supported components and minimum versio
 
 ## Want End User Monitoring?
 
-Instana provides deep end user monitoring that links server side traces with browser events.  See [End User Monitoring](https://instana.atlassian.net/wiki/display/DOCS/Web+End-User+Monitoring) in the Instana documentation portal.
+Instana provides deep end user monitoring that links server side traces with browser events.  
+
+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://instana.atlassian.net/wiki/display/DOCS/Web+End-User+Monitoring) in the Instana documentation portal.
 
 ## Development
 

data/lib/instana/agent.rb

@@ -63,6 +63,10 @@ module Instana
     def after_fork
       ::Instana.logger.agent "after_fork hook called. Falling back to unannounced state and spawning a new background agent thread."
 
+      # Reseed the random number generator for this
+      # new thread.
+      srand
+
       # Re-collect process information post fork
       @process = ::Instana::Util.collect_process_info
 

data/lib/instana/base.rb

@@ -1,6 +1,7 @@
 require "instana/version"
 require 'instana/logger'
 require "instana/util"
+require "instana/helpers"
 
 module Instana
   class << self

data/lib/instana/config.rb

@@ -10,6 +10,10 @@ module Instana
       @config[:metrics][:memory] = { :enabled => true }
       @config[:metrics][:thread] = { :enabled => true }
 
+      # EUM Related
+      @config[:eum_api_key] = nil
+      @config[:eum_baggage] = {}
+
       # HTTP Clients
       @config[:excon] = { :enabled => true }
     end

data/lib/instana/eum/eum-test.js.erb

@@ -0,0 +1,16 @@
+<script nonce="68afd870-ae85-48c6-9689-9a5c359d5a1f">
+  (function(i,s,o,g,r,a,m){i['InstanaEumObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//internal-eum.instana.io/eum.min.js','ineum');
+
+  ineum('reportingUrl', '//internal-eum.instana.io');
+  ineum('apiKey', '<%=::Instana.config[:eum_api_key]%>');
+  ineum('traceId', '<%=::Instana.tracer.trace_id_header%>');
+
+  <% if !::Instana.config[:eum_baggage].empty? %>
+    <% ::Instana.config[:eum_baggage].each do |k, v| %>
+      ineum('meta', '<%=k%>', '<%=v%>');
+    <% end %>
+  <% end %>
+</script>

data/lib/instana/eum/eum.js.erb

@@ -0,0 +1,14 @@
+<script>
+  (function(i,s,o,g,r,a,m){i['InstanaEumObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//eum.instana.io/eum.min.js','ineum');
+  ineum('apiKey', '<%=::Instana.config[:eum_api_key]%>');
+  ineum('traceId', '<%=::Instana.tracer.trace_id_header%>');
+
+  <% if !::Instana.config[:eum_baggage].empty? %>
+    <% ::Instana.config[:eum_baggage].each do |k, v| %>
+      ineum('meta', '<%=k%>', '<%=v%>');
+    <% end %>
+  <% end %>
+</script>

data/lib/instana/helpers.rb

@@ -0,0 +1,40 @@
+module Instana
+  module Helpers
+    EUM_SNIPPET= (File.read(File.dirname(__FILE__) + '/eum/eum.js.erb')).freeze
+    EUM_TEST_SNIPPET= (File.read(File.dirname(__FILE__) + '/eum/eum-test.js.erb')).freeze
+
+    class << self
+
+      # Returns a processed javascript snippet to be placed within the HEAD tag of an HTML page.
+      #
+      def eum_snippet(api_key, kvs = {})
+        return nil if !::Instana.tracer.tracing?
+
+        ::Instana.config[:eum_api_key] = api_key
+        ::Instana.config[:eum_baggage] = kvs
+
+        ERB.new(EUM_SNIPPET).result
+      rescue => e
+        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.debug e.backtrace.join("\r\n")
+        return nil
+      end
+
+      # Returns a processed javascript snippet to be placed within the HEAD tag of an HTML page.
+      # This one is used for testing only
+      #
+      def eum_test_snippet(api_key, kvs = {})
+        return nil if !::Instana.tracer.tracing?
+
+        ::Instana.config[:eum_api_key] = api_key
+        ::Instana.config[:eum_baggage] = kvs
+
+        ERB.new(EUM_TEST_SNIPPET).result
+      rescue => e
+        Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        Instana.logger.debug e.backtrace.join("\r\n")
+        return nil
+      end
+    end
+  end
+end

data/lib/instana/util.rb

@@ -90,10 +90,6 @@ module Instana
         data[:sensorVersion] = ::Instana::VERSION
         data[:ruby_version] = RUBY_VERSION
 
-        # Since a snapshot is only taken on process boot,
-        # this is ok here.
-        data[:start_time] = Time.now.to_s
-
         # Framework Detection
         if defined?(::RailsLts::VERSION)
           data[:framework] = "Rails on Rails LTS-#{::RailsLts::VERSION}"
@@ -111,6 +107,15 @@ module Instana
           data[:framework] = "Sinatra #{::Sinatra::VERSION}"
         end
 
+        # Report Bundle
+        if defined?(::Gem) && Gem.respond_to?(:loaded_specs)
+          data[:versions] = {}
+
+          Gem.loaded_specs.each do |k, v|
+            data[:versions][k] = v.version.to_s
+          end
+        end
+
         data
       rescue => e
         ::Instana.logger.error "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"

data/lib/instana/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 0.14.2
+  version: 0.15.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2016-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -136,10 +136,13 @@ files:
 - 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.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/net-http.rb