instana 1.7.6 → 1.7.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d45e4817a11c73f3e703e38cacb884cc2219393e
-  data.tar.gz: 099bd8ed5eb581eb5f550c1d22c1cb3744e1fc97
+  metadata.gz: c3fed3e3fee894cbd36d18cc5e01c85977a8c51d
+  data.tar.gz: baaa2b1e834962ed98e46bebda58bf6f9f411f24
 SHA512:
-  metadata.gz: 43ff3857a545a20eaea8295aa513abe77f3e5e15e7641235bcdcfaf146b502e28d75119f680a6c6933bf53151ed5ed3f7a5f0d9636ea46de26172bb4eaf4d733
-  data.tar.gz: 7fba5eb8b19c8c5a3da7df4cdc25af0e57de41c375eb2fff90059649950cc3c9566c8ccb43ddb5e81b49145727031babe10438c2ad3e62686e946b3e5aff557a
+  metadata.gz: c46e619221c89f61ebb3da597d9c77cbfbbdbc72455fad9ee83364998c41ffcb48dc09b78d9cd97fe2934cb33bd733032f4e6b97cb4221d3492fc54b58543b7d
+  data.tar.gz: fd8028cd58c3dd685f80a8fdb85d17ccde28c15c3b762398c9f2187837a67d50a76ccfbf55995e5892f37c0948944a28297c39d834e3fa1d6f017cff7992f215

data/README.md

@@ -10,6 +10,7 @@ The Instana gem provides Ruby metrics and traces (request, queue & cross-host) f
 [![Code
 Climate](https://codeclimate.com/github/instana/ruby-sensor/badges/gpa.svg)](https://codeclimate.com/github/instana/ruby-sensor)
 [![Gem Version](https://badge.fury.io/rb/instana.svg)](https://badge.fury.io/rb/instana)
+[![OpenTracing Badge](https://img.shields.io/badge/OpenTracing-enabled-blue.svg)](http://opentracing.io)
 
 ## Note
 

data/lib/instana/instrumentation/grpc.rb

@@ -45,7 +45,7 @@ end
 if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
   call_types.each do |call_type|
     GRPC::RpcDesc.class_eval <<-RUBY, __FILE__, __LINE__ + 1
-      def handle_#{call_type}_with_instana(active_call, mth)
+      def handle_#{call_type}_with_instana(active_call, mth, *others)
         kvs = { rpc: {} }
         metadata = active_call.metadata
 
@@ -66,7 +66,7 @@ if defined?(GRPC::RpcDesc) && ::Instana.config[:grpc][:enabled]
           :'rpc-server', kvs, incoming_context
         )
 
-        handle_#{call_type}_without_instana(active_call, mth)
+        handle_#{call_type}_without_instana(active_call, mth, *others)
       rescue => e
         kvs[:rpc][:error] = true
         ::Instana.tracer.log_info(kvs)

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

@@ -10,8 +10,8 @@ module Instana
 
         # Temporary until we move connection collection to redis
         # instrumentation
-        Sidekiq.redis_pool.with do |conn|
-          opts = conn.client.options
+        Sidekiq.redis_pool.with do |client|
+          opts = client.respond_to?(:connection) ? client.connection : client.client.options
           kv_payload[:'sidekiq-client'][:'redis-url'] = "#{opts[:host]}:#{opts[:port]}"
         end
 

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

@@ -10,8 +10,8 @@ module Instana
 
         # Temporary until we move connection collection to redis
         # instrumentation
-        Sidekiq.redis_pool.with do |conn|
-          opts = conn.client.options
+        Sidekiq.redis_pool.with do |client|
+          opts = client.respond_to?(:connection) ? client.connection : client.client.options
           kv_payload[:'sidekiq-worker'][:'redis-url'] = "#{opts[:host]}:#{opts[:port]}"
         end
 

data/lib/instana/version.rb

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

data/test/instrumentation/redis_test.rb

@@ -17,20 +17,14 @@ class RedisTest < Minitest::Test
     clear_all!
     redis_client = create_redis_client
 
-    redis_client.client.instance_eval do
-      def read
-        raise 'Something went wrong'
-      end
-    end
-
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
-        redis_client.set('hello', 'world')
+        redis_client.zadd('hello', 'invalid', 'value')
       rescue; end
     end
     redis_client.disconnect!
 
-    assert_redis_trace('SET', with_error: 'Something went wrong')
+    assert_redis_trace('ZADD', with_error: 'ERR value is not a valid float')
   end
 
   def test_pipeline_call
@@ -39,7 +33,8 @@ class RedisTest < Minitest::Test
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       redis_client.pipelined do
-        exec_sample_pipeline_calls(redis_client)
+        redis_client.set('hello', 'world')
+        redis_client.set('other', 'world')
       end
     end
 
@@ -50,21 +45,16 @@ class RedisTest < Minitest::Test
     clear_all!
     redis_client = create_redis_client
 
-    redis_client.client.instance_eval do
-      def read
-        raise 'Something went wrong'
-      end
-    end
-
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
         redis_client.pipelined do
-          exec_sample_pipeline_calls(redis_client)
+          redis_client.set('other', 'world')
+          redis_client.call('invalid')
         end
       rescue; end
     end
 
-    assert_redis_trace('PIPELINE', with_error: 'Something went wrong')
+    assert_redis_trace('PIPELINE', with_error: "ERR unknown command 'invalid'")
   end
 
   def test_multi_call
@@ -73,7 +63,8 @@ class RedisTest < Minitest::Test
 
     Instana.tracer.start_or_continue_trace(:redis_test) do
       redis_client.multi do
-        exec_sample_pipeline_calls(redis_client)
+        redis_client.set('hello', 'world')
+        redis_client.set('other', 'world')
       end
     end
 
@@ -84,21 +75,16 @@ class RedisTest < Minitest::Test
     clear_all!
     redis_client = create_redis_client
 
-    redis_client.client.instance_eval do
-      def read
-        raise 'Something went wrong'
-      end
-    end
-
     Instana.tracer.start_or_continue_trace(:redis_test) do
       begin
         redis_client.multi do
-          exec_sample_pipeline_calls(redis_client)
+          redis_client.set('other', 'world')
+          redis_client.call('invalid')
         end
       rescue; end
     end
 
-    assert_redis_trace('MULTI', with_error: 'Something went wrong')
+    assert_redis_trace('MULTI', with_error: "ERR unknown command 'invalid'")
   end
 
   private
@@ -107,12 +93,6 @@ class RedisTest < Minitest::Test
     Redis.new(url: ENV['I_REDIS_URL'])
   end
 
-  def exec_sample_pipeline_calls(redis_client)
-    redis_client.set('hello', 'world')
-    redis_client.set('other', 'world')
-    redis_client.hmset('awesome', 'wonderful', 'world')
-  end
-
   def assert_redis_trace(command, with_error: nil)
     assert_equal 1, ::Instana.processor.queue_count
     trace = ::Instana.processor.queued_traces.first

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.7.6
+  version: 1.7.7
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-28 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -309,51 +309,51 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Ruby sensor for Instana
 test_files:
+- test/agent/agent_test.rb
+- test/apps/cuba.rb
+- test/apps/grpc_server.rb
 - test/apps/roda.rb
 - test/apps/sinatra.rb
-- test/apps/grpc_server.rb
-- test/apps/cuba.rb
-- test/config_test.rb
-- test/agent/agent_test.rb
-- test/servers/sidekiq/worker.rb
-- test/servers/rackapp_6511.rb
-- test/servers/rails_3205.rb
-- test/servers/grpc_50051.rb
-- test/servers/helpers/sidekiq_worker_initializer.rb
-- test/instrumentation/excon_test.rb
-- test/instrumentation/net-http_test.rb
-- test/instrumentation/dalli_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/redis_test.rb
-- test/instrumentation/grpc_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
-- test/instrumentation/rest-client_test.rb
-- test/test_helper.rb
-- test/models/block.rb
 - test/benchmarks/bench_id_generation.rb
 - test/benchmarks/bench_opentracing.rb
-- test/frameworks/rails/activerecord4_test.rb
-- test/frameworks/rails/actionview5_test.rb
-- test/frameworks/rails/activerecord5_test.rb
+- test/config_test.rb
+- test/frameworks/cuba_test.rb
+- test/frameworks/rack_test.rb
+- test/frameworks/rails/actioncontroller_test.rb
 - test/frameworks/rails/actionview3_test.rb
 - test/frameworks/rails/actionview4_test.rb
-- test/frameworks/rails/actioncontroller_test.rb
+- test/frameworks/rails/actionview5_test.rb
 - test/frameworks/rails/activerecord3_test.rb
-- test/frameworks/rack_test.rb
-- test/frameworks/sinatra_test.rb
+- test/frameworks/rails/activerecord4_test.rb
+- test/frameworks/rails/activerecord5_test.rb
 - test/frameworks/roda_test.rb
-- test/frameworks/cuba_test.rb
+- test/frameworks/sinatra_test.rb
 - test/instana_test.rb
-- test/tracing/opentracing_test.rb
+- test/instrumentation/dalli_test.rb
+- test/instrumentation/excon_test.rb
+- test/instrumentation/grpc_test.rb
+- test/instrumentation/net-http_test.rb
+- test/instrumentation/redis_test.rb
+- test/instrumentation/rest-client_test.rb
+- test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
+- test/jobs/sidekiq_job_1.rb
+- 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
+- test/test_helper.rb
 - test/tracing/custom_test.rb
-- test/tracing/tracer_async_test.rb
+- test/tracing/id_management_test.rb
+- test/tracing/opentracing_test.rb
 - test/tracing/trace_test.rb
+- test/tracing/tracer_async_test.rb
 - test/tracing/tracer_test.rb
-- test/tracing/id_management_test.rb
-- test/jobs/sidekiq_job_2.rb
-- test/jobs/sidekiq_job_1.rb