instana 1.6.0 → 1.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5a3d47c55fdc82fdf62db42d36c098cf4e5855
-  data.tar.gz: 8630f17d5794a9f5786fd53e817b1efbcee0ba1d
+  metadata.gz: 57d7f31071d4fb159569882fbaa519377d25cfd4
+  data.tar.gz: 1fc724b9dc0012bea356c5a700207a8f9d893788
 SHA512:
-  metadata.gz: 4f50211eafb3e77d5a50aa33f81330e5d1d92116e2bb203ad95928ea46a0746ee1a5826052b21d97db1e81199f9686407589f3a0d05c8de58a7e4f021aad572b
-  data.tar.gz: 8cd886516b92ab60f13746816da3b928a69de26bd2d4779436f1423b0db0693c652cc8b46c90c8439e87e98b06511a6d6fbe2076ccaf6002db3c9f3d7831b9cd
+  metadata.gz: 644587f6ca8c5b735d0dc64dae7729bf066e7545d3545e04721243cf52bdbc751eb470017187b3bae6cd398a186529ee50d45975c1f18f4e9d76a83316c77e62
+  data.tar.gz: 55fd9be828d6ee2ed0ed9a905e1b910f56e78f9cb8f2b60e6dc67180d4353397e2c9c3ca67a619b4160d2dea9929e3ef6b06d37b8c828895b589b51581179e4c

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

@@ -2,9 +2,9 @@
   (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');
+      })(window,document,'script','//eum-test-fullstack-0-us-west-2.instana.io/eum.min.js','ineum');
 
-  ineum('reportingUrl', '//internal-eum.instana.io');
+  ineum('reportingUrl', '//eum-test-fullstack-0-us-west-2.instana.io');
   ineum('apiKey', '<%=::Instana.config[:eum_api_key]%>');
   ineum('traceId', '<%=::Instana.tracer.trace_id_header%>');
 

data/lib/instana/instrumentation/sidekiq-client.rb

@@ -5,9 +5,16 @@ module Instana
         kv_payload = { :'sidekiq-client' => {} }
         kv_payload[:'sidekiq-client'][:queue] = queue
         kv_payload[:'sidekiq-client'][:job] = worker_class
-        kv_payload[:'sidekiq-client'][:retry] = msg['retry']
+        kv_payload[:'sidekiq-client'][:retry] = msg['retry'].to_s
         ::Instana.tracer.log_entry(:'sidekiq-client', kv_payload)
 
+        # Temporary until we move connection collection to redis
+        # instrumentation
+        Sidekiq.redis_pool.with do |conn|
+          opts = conn.client.options
+          kv_payload[:'sidekiq-client'][:'redis-url'] = "#{opts[:host]}:#{opts[:port]}"
+        end
+
         context = ::Instana.tracer.context
         if context
           msg['X-Instana-T'] = context.trace_id_header

data/lib/instana/instrumentation/sidekiq-worker.rb

@@ -6,7 +6,14 @@ module Instana
         kv_payload[:'sidekiq-worker'][:job_id] = msg['jid']
         kv_payload[:'sidekiq-worker'][:queue] = msg['queue']
         kv_payload[:'sidekiq-worker'][:job] = msg['class']
-        kv_payload[:'sidekiq-worker'][:retry] = msg['retry']
+        kv_payload[:'sidekiq-worker'][:retry] = msg['retry'].to_s
+
+        # Temporary until we move connection collection to redis
+        # instrumentation
+        Sidekiq.redis_pool.with do |conn|
+          opts = conn.client.options
+          kv_payload[:'sidekiq-worker'][:'redis-url'] = "#{opts[:host]}:#{opts[:port]}"
+        end
 
         context = {}
         if msg.key?('X-Instana-T')

data/lib/instana/version.rb

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

data/test/instrumentation/sidekiq-client_test.rb

@@ -78,7 +78,7 @@ class SidekiqClientTest < Minitest::Test
     assert_equal :'sidekiq-client', second_span[:n]
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobOne', second_span[:data][:'sidekiq-client'][:job]
-    assert_equal false, second_span[:data][:'sidekiq-client'][:retry]
+    assert_equal "false", second_span[:data][:'sidekiq-client'][:retry]
     assert_equal job['jid'], second_span[:data][:'sidekiq-client'][:job_id]
   end
 
@@ -102,7 +102,7 @@ class SidekiqClientTest < Minitest::Test
 
     assert_equal 'some_random_queue', second_span[:data][:'sidekiq-client'][:queue]
     assert_equal 'SidekiqJobTwo', second_span[:data][:'sidekiq-client'][:job]
-    assert_equal false, second_span[:data][:'sidekiq-client'][:retry]
+    assert_equal "false", second_span[:data][:'sidekiq-client'][:retry]
     assert_equal 'Fail to enqueue job', second_span[:data][:log][:message]
   end
 

data/test/servers/helpers/sidekiq_worker_initializer.rb

@@ -0,0 +1,27 @@
+# This is a helper initializer to boot a local instrumented Sidekiq stack
+# for development and testing.
+#
+# export BUNDLE_GEMFILE=/path/to/ruby-sensor/gemfiles/libraries.gemfile
+# bundle install
+# bundle exec sidekiq -c 2 -q important -r ./test/servers/helpers/sidekiq_worker_initializer.rb
+#
+# In another shell, you can boot a console to queue jobs:
+#
+# export BUNDLE_GEMFILE=/path/to/ruby-sensor/gemfiles/libraries.gemfile
+# bundle install
+# bundle exec rake console
+# > require Dir.pwd + '/test/jobs/sidekiq_job_1.rb'
+# > Instana.tracer.start_or_continue_trace(:sidekiq_demo) do
+# >  ::Sidekiq::Client.push( 'queue' => 'important', 'class' => ::SidekiqJobOne,
+# >                          'args' => [1, 2, 3], 'retry' => false)
+# > end
+#
+
+# Load test jobs.
+require Dir.pwd + '/test/jobs/sidekiq_job_1.rb'
+require Dir.pwd + '/test/jobs/sidekiq_job_2.rb'
+
+require "sidekiq"
+require "instana"
+::Instana.logger.info "Booting instrumented sidekiq worker for tests."
+::Sidekiq.logger.level = ::Logger::DEBUG

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-31 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,6 +252,7 @@ files:
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
 - test/servers/grpc_50051.rb
+- test/servers/helpers/sidekiq_worker_initializer.rb
 - test/servers/rackapp_6511.rb
 - test/servers/rails_3205.rb
 - test/servers/sidekiq/worker.rb
@@ -315,6 +316,7 @@ test_files:
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
 - test/servers/grpc_50051.rb
+- test/servers/helpers/sidekiq_worker_initializer.rb
 - test/servers/rackapp_6511.rb
 - test/servers/rails_3205.rb
 - test/servers/sidekiq/worker.rb