instana 1.9.0 → 1.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19b57b244ae34d84adf8c974296e60f2030c61876a351a8f10418b06051ae7bf
-  data.tar.gz: 56509b6350e8de9b280747674084f510ef2b2240cedc4d7a3592504a5eb05f76
+  metadata.gz: 4e778abc3a02b507d19a21a97a2f675492c8f3b0a9b330819681dec32fe5408f
+  data.tar.gz: 7229ba517c01e1957b3e68263ec80e3f6c1641e2d786a66072c657fda81d84a6
 SHA512:
-  metadata.gz: 2c05dcf132296ba2d9c6ebca5769590d104c40aa678d8607ab2d381b96be78f68d85b783c8dc3ffeafce1353da8e0b74c013a997fdadedf82cc6311ca62c9e67
-  data.tar.gz: 7119c1e50c4f379a169dde1994e48754a5d6be3304f6cf2a8da00fd692a17eea1d1122b979e15498612eec1774104a4863cc381f6e9d274406cb61efafddf9d9
+  metadata.gz: b0d1509d303d98ac8750a9adf09df794056cdf2ca12631ba079a681b9d7c0a346c14a81b78cd09b95684959f25adecc2a41dbbcb0075704ebcd22d6a85227942
+  data.tar.gz: a8c0d8dab39ae7e2ce27e677855c9ed477f95fb7845a46d8a3edc56c442919d6387477d911ae5918bbd9d67a62871814d711ef7bc9f5703cb0dabcadde9cbd85

data/.travis.yml

@@ -6,12 +6,13 @@ cache:
     - vendor/bundle
 
 rvm:
-  - 2.4.3
-  - 2.1.10
+  - 2.5
+  - 2.4
 
 before_install:
-  - gem update --system
-  - gem update bundler
+  # Re: https://docs.travis-ci.com/user/languages/ruby/#dependency-management
+  - gem uninstall -v '>= 2' -i $(rvm gemdir)@global -ax bundler || true
+  - gem install bundler -v '< 2'
   - gem --version
 
 before_script:
@@ -30,16 +31,12 @@ gemfile:
   - gemfiles/libraries.gemfile
   - gemfiles/rails50.gemfile
   - gemfiles/rails42.gemfile
-  - gemfiles/rails32.gemfile
 
 matrix:
   exclude:
     # Rails 5.0+ requires Ruby 2.2.2 or higher
     - rvm: 2.1.10
       gemfile: gemfiles/rails50.gemfile
-    # Rails 3.2 doesn't work on Ruby 2.4.1
-    - rvm: 2.4.3
-      gemfile: gemfiles/rails32.gemfile
 
 notifications:
   slack:

data/Gemfile

@@ -10,7 +10,7 @@ group :development, :test do
 
   # Rack v2 dropped support for Ruby 2.2 and higher.
   if RUBY_VERSION < '2.2'
-    gem 'rack', '< 2.0'
+    gem 'rack', '~> 1.6'
   end
   gem 'rack-test'
 

data/lib/instana/instrumentation/rack.rb

@@ -19,6 +19,10 @@ module Instana
         kvs[:http][:host] = env['SERVER_NAME']
       end
 
+      if ENV.key?('INSTANA_SERVICE_NAME')
+        kvs[:service] = ENV['INSTANA_SERVICE_NAME']
+      end
+
       if ::Instana.agent.extra_headers
         for custom_header in ::Instana.agent.extra_headers
           # Headers are available in this format: HTTP_X_CAPTURE_THIS

data/lib/instana/instrumentation/resque.rb

@@ -68,15 +68,19 @@ module Instana
 
       def perform_with_instana(job)
         kvs = {}
+        kvs[:'resque-worker'] = {}
 
         begin
-          kvs[:job] = job.payload['class'].to_s
-          kvs[:queue] = job.queue
+          if ENV.key?('INSTANA_SERVICE_NAME')
+            kvs[:service] = ENV['INSTANA_SERVICE_NAME']
+          end
+          kvs[:'resque-worker'][:job] = job.payload['class'].to_s
+          kvs[:'resque-worker'][:queue] = job.queue
         rescue => e
           ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" if Instana::Config[:verbose]
         end
 
-        Instana.tracer.start_or_continue_trace(:'resque-worker', { :'resque-worker' => kvs }) do
+        Instana.tracer.start_or_continue_trace(:'resque-worker', kvs) do
           perform_without_instana(job)
         end
       end

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

@@ -15,6 +15,10 @@ module Instana
           kv_payload[:'sidekiq-worker'][:'redis-url'] = "#{opts[:host]}:#{opts[:port]}"
         end
 
+        if ENV.key?('INSTANA_SERVICE_NAME')
+          kv_payload[:service] = ENV['INSTANA_SERVICE_NAME']
+        end
+
         context = {}
         if msg.key?('X-Instana-T')
           trace_id = msg.delete('X-Instana-T')

data/lib/instana/version.rb

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

data/test/frameworks/rack_test.rb

@@ -47,6 +47,24 @@ class RackTest < Minitest::Test
     refute_nil first_span[:stack].first[:f].match(/instana\/instrumentation\/rack.rb/)
   end
 
+  def test_basic_get_with_custom_service_name
+    ENV['INSTANA_SERVICE_NAME'] = 'WalterBishop'
+
+    clear_all!
+    get '/mrlobster'
+    assert last_response.ok?
+
+    spans = ::Instana.processor.queued_spans
+
+    # Span validation
+    assert_equal 1, spans.count
+
+    first_span = spans.first
+    assert_equal 'WalterBishop', first_span[:data][:service]
+
+    ENV.delete('INSTANA_SERVICE_NAME')
+  end
+
   def test_basic_post
     clear_all!
     post '/mrlobster'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.9.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2019-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -322,49 +322,49 @@ signing_key:
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics 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/benchmarks/bench_id_generation.rb
-- test/benchmarks/bench_opentracing.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/actionview5_test.rb
-- test/frameworks/rails/activerecord3_test.rb
-- test/frameworks/rails/activerecord4_test.rb
-- test/frameworks/rails/activerecord5_test.rb
-- test/frameworks/roda_test.rb
-- test/frameworks/sinatra_test.rb
-- test/instana_test.rb
+- test/tracing/id_management_test.rb
+- test/tracing/tracer_test.rb
+- test/tracing/custom_test.rb
+- test/tracing/opentracing_test.rb
+- test/tracing/trace_test.rb
+- test/tracing/tracer_async_test.rb
+- test/agent/agent_test.rb
+- test/models/block.rb
+- test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/resque_test.rb
+- test/instrumentation/sidekiq-worker_test.rb
+- test/instrumentation/redis_test.rb
+- test/instrumentation/rest-client_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/resque_test.rb
-- test/instrumentation/rest-client_test.rb
-- test/instrumentation/sidekiq-client_test.rb
-- test/instrumentation/sidekiq-worker_test.rb
+- test/benchmarks/bench_opentracing.rb
+- test/benchmarks/bench_id_generation.rb
+- test/test_helper.rb
+- test/jobs/sidekiq_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
-- test/servers/grpc_50051.rb
-- test/servers/helpers/sidekiq_worker_initializer.rb
+- test/jobs/resque_fast_job.rb
+- test/frameworks/cuba_test.rb
+- test/frameworks/rack_test.rb
+- test/frameworks/roda_test.rb
+- test/frameworks/sinatra_test.rb
+- test/frameworks/rails/actionview4_test.rb
+- test/frameworks/rails/activerecord3_test.rb
+- test/frameworks/rails/actioncontroller_test.rb
+- test/frameworks/rails/actionview5_test.rb
+- test/frameworks/rails/actionview3_test.rb
+- test/frameworks/rails/activerecord5_test.rb
+- test/frameworks/rails/activerecord4_test.rb
+- test/apps/sinatra.rb
+- test/apps/roda.rb
+- test/apps/cuba.rb
+- test/apps/grpc_server.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/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/servers/grpc_50051.rb
+- test/servers/rails_3205.rb
+- test/servers/helpers/sidekiq_worker_initializer.rb
+- test/instana_test.rb