instana 1.9.0.sillyrabbit → 1.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0ba941e65d061723cef0a542c2f65d80d4956a9b
-  data.tar.gz: defbff62c39a5e8dbc8e3fabceff42a43c29932e
+SHA256:
+  metadata.gz: 19b57b244ae34d84adf8c974296e60f2030c61876a351a8f10418b06051ae7bf
+  data.tar.gz: 56509b6350e8de9b280747674084f510ef2b2240cedc4d7a3592504a5eb05f76
 SHA512:
-  metadata.gz: 349ec35ff3ed2efc30fa13c9257262ae8464c1ebca45fc5398d570cb2253e185a7a17f20211720ec36e0c975ccab1f5cc1f0f5c548ee0865347c08e9f23dfee4
-  data.tar.gz: 258a0b56f3af4d9e49f1ac53d3ba74d214ce8f9a7cfdb25cd41e1d2314177e0f65e06369ca2175dfc4e3c197da3cd06046de426c0cd4c1e9e72a2817ba3a6092
+  metadata.gz: 2c05dcf132296ba2d9c6ebca5769590d104c40aa678d8607ab2d381b96be78f68d85b783c8dc3ffeafce1353da8e0b74c013a997fdadedf82cc6311ca62c9e67
+  data.tar.gz: 7119c1e50c4f379a169dde1994e48754a5d6be3304f6cf2a8da00fd692a17eea1d1122b979e15498612eec1774104a4863cc381f6e9d274406cb61efafddf9d9

data/lib/instana/agent.rb

@@ -290,7 +290,7 @@ module Instana
       uri = URI.parse("http://#{@discovered[:agent_host]}:#{@discovered[:agent_port]}/#{path}")
       req = Net::HTTP::Post.new(uri)
 
-      req.body = Oj.dump(spans)
+      req.body = Oj.dump(spans, :omit_nil => true)
       response = make_host_agent_request(req)
 
       if response

data/lib/instana/frameworks/rails.rb

@@ -1,26 +1,40 @@
 require "instana/rack"
 
 if defined?(::Rails)
-  # In Rails, let's use the Rails logger
-  ::Instana.logger = ::Rails.logger if ::Rails.logger
 
   if ::Rails::VERSION::MAJOR < 3
     ::Rails.configuration.after_initialize do
-      ::Instana.logger.info "Instrumenting Rack"
-      ::Rails.configuration.middleware.insert 0, ::Instana::Rack
+      # In Rails, let's use the Rails logger
+      ::Instana.logger = ::Rails.logger if ::Rails.logger
+
+      if ::Instana.config[:tracing][:enabled]
+        ::Instana.logger.info "Instrumenting Rack"
+        ::Rails.configuration.middleware.insert 0, ::Instana::Rack
+      else
+        ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
+      end
     end
   else
     module ::Instana
       class Railtie < ::Rails::Railtie
         initializer 'instana.rack' do |app|
-          ::Instana.logger.info "Instrumenting Rack"
-          app.config.middleware.insert 0, ::Instana::Rack
+          # In Rails, let's use the Rails logger
+          ::Instana.logger = ::Rails.logger if ::Rails.logger
+
+          if ::Instana.config[:tracing][:enabled]
+            ::Instana.logger.info "Instrumenting Rack"
+            app.config.middleware.insert 0, ::Instana::Rack
+          else
+            ::Instana.logger.info "Rack: Tracing disabled via config.  Not enabling middleware."
+          end
         end
 
-        config.after_initialize do
-          require "instana/frameworks/instrumentation/active_record"
-          require "instana/frameworks/instrumentation/action_controller"
-          require "instana/frameworks/instrumentation/action_view"
+        if ::Instana.config[:tracing][:enabled]
+          config.after_initialize do
+            require "instana/frameworks/instrumentation/active_record"
+            require "instana/frameworks/instrumentation/action_controller"
+            require "instana/frameworks/instrumentation/action_view"
+          end
         end
       end
     end

data/lib/instana/instrumentation/resque.rb

@@ -20,7 +20,7 @@ module Instana
           Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         end
 
-        kvs
+        { :'resque-client' => kvs }
       end
 
       def enqueue_with_instana(klass, *args)
@@ -72,12 +72,11 @@ module Instana
         begin
           kvs[:job] = job.payload['class'].to_s
           kvs[:queue] = job.queue
-          kvs[:args] = job.payload['args'].to_json
         rescue => e
-          Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if Instana::Config[:verbose]
+          ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if Instana::Config[:verbose]
         end
 
-        Instana.tracer.start_or_continue_trace(:'resque-worker', nil, kvs) do
+        Instana.tracer.start_or_continue_trace(:'resque-worker', { :'resque-worker' => kvs }) do
           perform_without_instana(job)
         end
       end
@@ -90,8 +89,12 @@ module Instana
 
       def fail_with_instana(exception)
         if Instana.tracer.tracing?
-          Instana.tracer.log_error(:resque, exception)
+          ::Instana.tracer.log_info(:'resque-worker' => { :error => "#{exception.class}: #{exception}"})
+          ::Instana.tracer.log_error(exception)
         end
+      rescue Exception => e
+        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if Instana::Config[:verbose]
+      ensure
         fail_without_instana(exception)
       end
     end

data/lib/instana/version.rb

@@ -1,4 +1,4 @@
 module Instana
-  VERSION = "1.9.0.sillyrabbit"
+  VERSION = "1.9.0"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/resque_test.rb

@@ -1,6 +1,6 @@
 require 'test_helper'
-require_relative "../jobs/resque_job_1"
-require_relative "../jobs/resque_job_2"
+require_relative "../jobs/resque_fast_job"
+require_relative "../jobs/resque_error_job"
 require 'resque'
 
 if ENV.key?('REDIS_URL')
@@ -12,6 +12,9 @@ end
 class ResqueClientTest < Minitest::Test
   def setup
     clear_all!
+    ENV['FORK_PER_JOB'] = 'false'
+    Resque.redis.redis.flushall
+    @worker = Resque::Worker.new(:critical)
   end
 
   def teardown
@@ -19,7 +22,7 @@ class ResqueClientTest < Minitest::Test
 
   def test_enqueue
     ::Instana.tracer.start_or_continue_trace('resque-client_test') do
-      ::Resque.enqueue(ResqueWorkerJob1)
+      ::Resque.enqueue(FastJob)
     end
 
     traces = Instana.processor.queued_traces
@@ -29,13 +32,18 @@ class ResqueClientTest < Minitest::Test
     assert_equal 3, spans.count
 
     assert_equal :'resque-client_test', spans[0][:data][:sdk][:name]
+
     assert_equal :"resque-client", spans[1][:n]
+    assert_equal "FastJob", spans[1][:data][:'resque-client'][:job]
+    assert_equal :critical, spans[1][:data][:'resque-client'][:queue]
+    assert_equal false, spans[1][:data][:'resque-client'].key?(:error)
+
     assert_equal :redis, spans[2][:n]
   end
 
   def test_enqueue_to
     ::Instana.tracer.start_or_continue_trace('resque-client_test') do
-      ::Resque.enqueue_to(:critical, ResqueWorkerJob1)
+      ::Resque.enqueue_to(:critical, FastJob)
     end
 
     traces = Instana.processor.queued_traces
@@ -46,12 +54,15 @@ class ResqueClientTest < Minitest::Test
 
     assert_equal :'resque-client_test', spans[0][:data][:sdk][:name]
     assert_equal :"resque-client", spans[1][:n]
+    assert_equal "FastJob", spans[1][:data][:'resque-client'][:job]
+    assert_equal :critical, spans[1][:data][:'resque-client'][:queue]
+    assert_equal false, spans[1][:data][:'resque-client'].key?(:error)
     assert_equal :redis, spans[2][:n]
   end
 
   def test_dequeue
     ::Instana.tracer.start_or_continue_trace('resque-client_test', '', {}) do
-      ::Resque.dequeue(ResqueWorkerJob2, { :generate => :farfalla })
+      ::Resque.dequeue(FastJob, { :generate => :farfalla })
     end
 
     traces = Instana.processor.queued_traces
@@ -62,6 +73,56 @@ class ResqueClientTest < Minitest::Test
 
     assert_equal :'resque-client_test', spans[0][:data][:sdk][:name]
     assert_equal :"resque-client", spans[1][:n]
+    assert_equal "FastJob", spans[1][:data][:'resque-client'][:job]
+    assert_equal :critical, spans[1][:data][:'resque-client'][:queue]
+    assert_equal false, spans[1][:data][:'resque-client'].key?(:error)
     assert_equal :redis, spans[2][:n]
   end
+
+  def test_worker_job
+    Resque::Job.create(:critical, FastJob)
+    @worker.work(0)
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+
+    spans = traces[0].spans.to_a
+    assert_equal 3, spans.count
+
+    resque_span = spans[0]
+    redis1_span = spans[1]
+    redis2_span = spans[2]
+
+    assert_equal :'resque-worker', resque_span[:n]
+    assert_equal false, resque_span.key?(:error)
+    assert_equal false, resque_span.key?(:ec)
+    assert_equal "FastJob", resque_span[:data][:'resque-worker'][:job]
+    assert_equal "critical", resque_span[:data][:'resque-worker'][:queue]
+    assert_equal false, resque_span[:data][:'resque-worker'].key?(:error)
+
+    assert_equal :redis, redis1_span[:n]
+    assert_equal "SET", redis1_span[:data][:redis][:command]
+    assert_equal :redis, redis2_span[:n]
+    assert_equal "SET", redis2_span[:data][:redis][:command]
+  end
+
+  def test_worker_error_job
+    Resque::Job.create(:critical, ErrorJob)
+    @worker.work(0)
+
+    traces = Instana.processor.queued_traces
+    assert_equal 1, traces.count
+
+    spans = traces[0].spans.to_a
+    resque_span = spans[0]
+    assert_equal 5, spans.count
+
+    assert_equal :'resque-worker', resque_span[:n]
+    assert_equal true, resque_span.key?(:error)
+    assert_equal 1, resque_span[:ec]
+    assert_equal "ErrorJob", resque_span[:data][:'resque-worker'][:job]
+    assert_equal "critical", resque_span[:data][:'resque-worker'][:queue]
+    assert_equal "Exception: Silly Rabbit, Trix are for kids.", resque_span[:data][:'resque-worker'][:error]
+    assert_equal Array, resque_span[:stack].class
+  end
 end

data/test/jobs/resque_error_job.rb

@@ -0,0 +1,16 @@
+require "redis"
+require "net/http"
+
+class ErrorJob
+  @queue = :critical
+
+  def self.perform
+    redis = Redis.new(url: ENV['REDIS_URL'])
+
+    dt = Time.now
+    redis.set('ts', dt)
+
+    raise Exception.new("Silly Rabbit, Trix are for kids.")
+    redis.set(:nb_id, 2)
+  end
+end

data/test/jobs/resque_fast_job.rb

@@ -0,0 +1,14 @@
+require "redis"
+require "net/http"
+
+class FastJob
+  @queue = :critical
+
+  def self.perform
+    redis = Redis.new(url: ENV['REDIS_URL'])
+
+    dt = Time.now
+    redis.set('ts', dt)
+    redis.set(:nb_id, 2)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.9.0.sillyrabbit
+  version: 1.9.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-18 00:00:00.000000000 Z
+date: 2018-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -280,8 +280,8 @@ files:
 - test/instrumentation/rest-client_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
-- test/jobs/resque_job_1.rb
-- test/jobs/resque_job_2.rb
+- test/jobs/resque_error_job.rb
+- test/jobs/resque_fast_job.rb
 - test/jobs/sidekiq_job_1.rb
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
@@ -312,12 +312,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
@@ -351,8 +351,8 @@ test_files:
 - test/instrumentation/rest-client_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
-- test/jobs/resque_job_1.rb
-- test/jobs/resque_job_2.rb
+- test/jobs/resque_error_job.rb
+- test/jobs/resque_fast_job.rb
 - test/jobs/sidekiq_job_1.rb
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb

data/test/jobs/resque_job_1.rb

@@ -1,11 +0,0 @@
-class ResqueWorkerJob1
-  @queue = :normal
-
-  def self.perform(*args)
-    rc = Redis.new(url: ENV['REDIS_URL'])
-
-    rc.set('hello', 'world')
-    rc.set('hello', 'paramount')
-    rc.set('other', 'hello')
-  end
-end

data/test/jobs/resque_job_2.rb

@@ -1,7 +0,0 @@
-class ResqueWorkerJob2
-  @queue = :normal
-
-  def self.perform(*args)
-    raise "Fake exception"
-  end
-end