instana 1.9.5 → 1.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d484b67adb54ad885c11555d05f53269245ca0406a5b74e98e2045494edc957
-  data.tar.gz: c7c72e9f23641b258cae02c9e424ac35257db56c8c550a8abb133f22a7d26b52
+  metadata.gz: a3d6441f6a619ad0643ea9a9afbcebefd86d57171dc14cc12eccd71dbbbb0db8
+  data.tar.gz: b4b5ea14c821e9a3b53cc9e41b4a0e5e4a9026ec586b8c5753055f292d631cea
 SHA512:
-  metadata.gz: 1de7b6608d8b7ec849bf1f668f167f7e88b5650451b05a17ec9de3e52cb50497629af46a066730b3f3f87403562227e3a52f93eac27bb8dd15691df0f2cbdd0b
-  data.tar.gz: 7fe4ea25642c04dfc249301a0a37a28d1c64066ecb0c778f19c7b7961652ff051b11e498df7c981345880f95c9d0779224c352f0f6be2596c0ea67fa80bc62e8
+  metadata.gz: a416ce7dd571f2eb2dff56d1460dabb528cd0683bd5e9d09534db2bdd352ddd400bbd79c1ddfae804908df725cafa1587e5cc91c5fec26eff5ce44477aa090d8
+  data.tar.gz: c8eff792dba833a94420b58d3a27f55402aa90dd94a99594565c0b4a7610de1fa3c76a7b410d582dac4351783afcff362410e2718c793611fcef203c78dde1e9

data/.gitignore

@@ -13,3 +13,4 @@ gemfiles/*.lock
 /test/tmp/*.pid
 .idea
 *.iml
+.DS_Store

data/.travis.yml

@@ -10,9 +10,8 @@ rvm:
   - 2.4
 
 before_install:
-  # 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 update --system
+  - gem install bundler
   - gem --version
 
 before_script:
@@ -25,12 +24,12 @@ services:
   - memcached
   - redis
   - mysql
+  - postgresql
 
 gemfile:
   - Gemfile
   - gemfiles/libraries.gemfile
   - gemfiles/rails50.gemfile
-  - gemfiles/rails42.gemfile
 
 matrix:
   exclude:

data/Configuration.md

@@ -74,7 +74,7 @@ export INSTANA_SERVICE_NAME=MrBlueSky
 
 ## Rack Middleware
 
-This gem will detect and automagically insert the Instana Rack middleware into the middleware stack when a [supported framework](https://instana.atlassian.net/wiki/display/DOCS/Ruby) is present.  We are currently adding support for more frameworks.  If you are using a yet to be instrumented framework, you can insert the Instana Rack middleware with the following:
+This gem will detect and automagically insert the Instana Rack middleware into the middleware stack when a [supported framework](https://docs.instana.io/ecosystem/ruby/) is present.  We are currently adding support for more frameworks.  If you are using a yet to be instrumented framework, you can insert the Instana Rack middleware with the following:
 
 ```Ruby
 require "instana/rack"

data/Rakefile

@@ -10,34 +10,41 @@ Rake::TestTask.new(:test) do |t|
   t.libs << "lib"
   t.test_files = FileList['test/**/*_test.rb']
 
-  case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
-  when /rails50/
-    t.test_files = [ 'test/frameworks/rails/activerecord5_test.rb',
-                     'test/frameworks/rails/actioncontroller_test.rb',
-                     'test/frameworks/rails/actionview5_test.rb' ]
-  when /rails42/
-    t.test_files = [ 'test/frameworks/rails/activerecord4_test.rb',
-                     'test/frameworks/rails/actioncontroller_test.rb',
-                     'test/frameworks/rails/actionview4_test.rb' ]
-  when /rails32/
-    t.test_files = [ 'test/frameworks/rails/activerecord3_test.rb',
-                     'test/frameworks/rails/actioncontroller_test.rb',
-                     'test/frameworks/rails/actionview3_test.rb' ]
-  when /libraries/
-    t.test_files = FileList['test/instrumentation/*_test.rb',
-                            'test/frameworks/cuba_test.rb',
-                            'test/frameworks/roda_test.rb',
-                            'test/frameworks/sinatra_test.rb']
+  if ENV.key?('BUNDLE_GEMFILE')
+    case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
+    when /rails50/
+      t.test_files = %w(test/frameworks/rails/activerecord5_test.rb
+                        test/frameworks/rails/actioncontroller_test.rb
+                        test/frameworks/rails/actionview5_test.rb)
+    when /rails42/
+      t.test_files = %w(test/frameworks/rails/activerecord4_test.rb
+                        test/frameworks/rails/actioncontroller_test.rb
+                        test/frameworks/rails/actionview4_test.rb)
+    when /rails32/
+      t.test_files = %w(test/frameworks/rails/activerecord3_test.rb
+                        test/frameworks/rails/actioncontroller_test.rb
+                        test/frameworks/rails/actionview3_test.rb)
+    when /libraries/
+      t.test_files = FileList['test/instrumentation/*_test.rb',
+                              'test/frameworks/cuba_test.rb',
+                              'test/frameworks/roda_test.rb',
+                              'test/frameworks/sinatra_test.rb']
+    else
+      t.test_files = FileList['test/agent/*_test.rb'] +
+                     FileList['test/tracing/*_test.rb'] +
+                     FileList['test/profiling/*_test.rb'] +
+                     FileList['test/benchmarks/bench_*.rb']
+    end
   else
     t.test_files = FileList['test/agent/*_test.rb'] +
-                   FileList['test/tracing/*_test.rb'] +
-                   FileList['test/profiling/*_test.rb'] +
-                   FileList['test/benchmarks/bench_*.rb']
+        FileList['test/tracing/*_test.rb'] +
+        FileList['test/profiling/*_test.rb'] +
+        FileList['test/benchmarks/bench_*.rb']
   end
 end
 
 task :environment do
-  ENV['INSTANA_GEM_DEV'] = 'true'
+  ENV['INSTANA_DEBUG'] = 'true'
   Bundler.require(:default, :development)
 end
 

data/Troubleshooting.md

@@ -6,7 +6,7 @@ goes wrong, you can use the following steps and tips to potentially diagnose any
 # Supported Components
 
 Make sure that the component that you want to get visibility into has been added to the support matrix.  A list of all
-supported components can be found in the [documentation](https://instana.atlassian.net/wiki/display/DOCS/Ruby).
+supported components can be found in the [documentation](https://docs.instana.io/ecosystem/ruby/).
 
 # Logging & Environment Variables
 

data/gemfiles/libraries.gemfile

@@ -49,7 +49,7 @@ gem 'excon'
 
 # Memcache
 gem 'dalli'
-gem 'redis', '< 4.0.0'
+gem 'redis'
 
 # Background Job queuing and processing
 if RUBY_VERSION < '2.2'

data/instana.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
 
   spec.licenses      = ['MIT']
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
 

data/lib/instana/base.rb

@@ -1,5 +1,5 @@
+require "logger"
 require "instana/version"
-require 'instana/logger'
 require "instana/util"
 require "instana/helpers"
 
@@ -45,5 +45,26 @@ module Instana
 end
 
 # Setup the logger as early as possible
-::Instana.logger = ::Instana::XLogger.new(STDOUT)
+
+# Default Logger outputs to STDOUT
+::Instana.logger = Logger.new(STDOUT)
+
+# Can instead log to a file that is rotated every 10M
+# ::Instana.logger = Logger.new("instana.log", 10, 1073741824)
+
+if ENV.key?('INSTANA_GEM_TEST')
+  ::Instana.logger.level = Logger::DEBUG
+elsif ENV.key?('INSTANA_GEM_DEV') || ENV.key?('INSTANA_DEBUG')
+  ::Instana.logger.level = Logger::DEBUG
+elsif ENV.key?('INSTANA_QUIET')
+  ::Instana.logger.level = Logger::FATAL
+else
+  ::Instana.logger.level = Logger::WARN
+end
+
+::Instana.logger.formatter = proc do |severity, datetime, progname, msg|
+  "#{datetime}: #{severity.rjust(5)} Instana: #{progname} #{msg}\n"
+end
+
+
 ::Instana.logger.info "Stan is on the scene.  Starting Instana instrumentation version #{::Instana::VERSION}"

data/lib/instana/frameworks/instrumentation/action_controller.rb

@@ -11,7 +11,7 @@ module Instana
       #
       # @return [Boolean]
       #
-      def has_rails_handler?
+      def has_rails_handler?(exception)
         found = false
         rescue_handlers.detect do |klass_name, _handler|
           # Rescue handlers can be specified as strings or constant names
@@ -21,7 +21,7 @@ module Instana
         end
         found
       rescue => e
-        ::Instana.logger.debug "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
+        ::Instana.logger.debug { "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}" }
         return false
       end
 
@@ -72,7 +72,7 @@ module Instana
 
         super(*args)
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e) unless has_rails_handler?(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:actioncontroller)
@@ -92,7 +92,7 @@ module Instana
 
         super(*args, &blk)
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e) unless has_rails_handler?(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:actionview)
@@ -124,7 +124,7 @@ module Instana
 
         process_action_without_instana(*args)
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e) unless has_rails_handler?(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:actioncontroller)
@@ -141,7 +141,7 @@ module Instana
         ::Instana.tracer.log_entry(:actionview, :actionview => { :name => name })
         render_without_instana(*args, &blk)
       rescue Exception => e
-        ::Instana.tracer.log_error(e) unless has_rails_handler?
+        ::Instana.tracer.log_error(e) unless has_rails_handler?(e)
         raise
       ensure
         ::Instana.tracer.log_exit(:actionview)

data/lib/instana/instrumentation.rb

@@ -3,7 +3,7 @@ module Instana
 end
 
 
-if !ENV.key?('INSTANA_DISABLE_AUTO_INSTR')
+if !ENV.key?('INSTANA_DISABLE_AUTO_INSTR') || ENV['INSTANA_DISABLE_AUTO_INSTR'] === 'false'
   #
   # Load all of the files in the specified subdirectories
   #

data/lib/instana/version.rb

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

data/test/instrumentation/redis_test.rb

@@ -115,7 +115,7 @@ class RedisTest < Minitest::Test
 
     if with_error
       assert_equal true, data[:redis][:error]
-      assert_equal with_error, data[:log][:message]
+      assert data[:log].key?(:message)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.9.5
+  version: 1.9.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +235,6 @@ files:
 - lib/instana/instrumentation/rest-client.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
-- lib/instana/logger.rb
 - lib/instana/opentracing/carrier.rb
 - lib/instana/opentracing/tracer.rb
 - lib/instana/rack.rb

data/lib/instana/logger.rb

@@ -1,40 +0,0 @@
-require "logger"
-
-module Instana
-  class XLogger < Logger
-    STAMP = "Instana: ".freeze
-
-    def initialize(*args)
-      super(*args)
-      if ENV.key?('INSTANA_GEM_TEST')
-        self.level = Logger::DEBUG
-      elsif ENV.key?('INSTANA_GEM_DEV') || ENV.key?('INSTANA_DEBUG')
-        self.level = Logger::DEBUG
-      elsif ENV.key?('INSTANA_QUIET')
-        self.level = Logger::FATAL
-      else
-        self.level = Logger::WARN
-      end
-    end
-
-    def error(msg)
-      super(STAMP + msg)
-    end
-
-    def warn(msg)
-      super(STAMP + msg)
-    end
-
-    def info(msg)
-      super(STAMP + msg)
-    end
-
-    def debug(msg)
-      super(STAMP + msg)
-    end
-
-    def unkown(msg)
-      super(STAMP + msg)
-    end
-  end
-end