instana 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: adc4cb8ce42b827dfc8b08f0e52de9950ca1c57f9ede6ec86259ac9a81ff3ce0
-  data.tar.gz: 5b0c1b1afbb4f5d76db69aa88dc8e610e23e1e11babe04f6f0c0242e8a5ae05a
+  metadata.gz: c4db47f5122c6e0eaf7bad00a6d957c61d24b02388f6825bbca0a12ebd7f66f2
+  data.tar.gz: 27789ad51f9da00b7e36e9133aca998cf3afd2e8558906042f0fe6c315c5eaaa
 SHA512:
-  metadata.gz: 8c11d0557caf968f3a238821825d08fa8a3a555d4e38cedaefb2f2db958e0300dede11da2d526bdfee03ec87fa3ff5400b5b93adab190e72bb9bd70f3f6230e3
-  data.tar.gz: 44708267befb20198a8bef872d09977ee033a7789c63c042f0b78d87549d4df47fa589501158d5e71d6c32b3fcf025f1706771513f43b366087d0ac43808cf8a
+  metadata.gz: 909a3eddcc3c749c7e307fb6ec6c8e6a1b8bc5f0005d3c97cbe5e61958e05de6a69103581709503587ab5482069c24400ab1ac90ea246ac4f6aa2946b6967513
+  data.tar.gz: 2452014812a75f56ad53921db3d0c4c55b8a6f22f4bb063d79b77bb56b975411d671db4378e693fbd1e69f664b8ffb7f44cc6a8a109af0c1aa9659af6b084929

data/Gemfile

@@ -21,16 +21,16 @@ end
 group :development do
   gem 'ruby-debug',   :platforms => [:mri_18, :jruby]
   gem 'debugger',     :platform  =>  :mri_19
-  gem 'stackprof'
+  gem 'stackprof',    :platform  =>  [:mri_19, :mri_20]
 
   if RUBY_VERSION > '1.8.7'
     gem 'pry'
 
     if RUBY_VERSION < '2.2'
-      gem 'byebug', '< 9.1.0'
-      gem 'pry-byebug'
+      gem 'byebug', '< 9.1.0', :platform  =>  [:mri_19, :mri_20]
+      gem 'pry-byebug', :platform  =>  [:mri_19, :mri_20]
     else
-      gem 'pry-byebug'
+      gem 'pry-byebug', :platform  =>  [:mri_19, :mri_20]
     end
   else
     gem 'pry', '0.9.12.4'

data/benchmarks/Gemfile

@@ -3,9 +3,5 @@ source "https://rubygems.org"
 
 git_source(:github) {|repo_name| "https://github.com/instana/#{repo_name}" }
 
-gem "puma"
-gem "rack"
-gem "ruby-prof"
-
 gem "instana", :path => "~/Projects/instana/ruby-sensor"
 

data/instana.gemspec

@@ -26,16 +26,18 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "minitest", "~> 5.0"
+  spec.add_development_dependency('pry', '>= 0.10.0')
 
   # Development debugging
-  spec.add_development_dependency('byebug', '>= 8.0.0')
-  spec.add_development_dependency('pry', '>= 0.10.0')
-  spec.add_development_dependency('pry-byebug', '>= 3.0.0')
+  unless RUBY_PLATFORM =~ /java/i
+    spec.add_development_dependency('byebug', '>= 8.0.0')
+    spec.add_development_dependency('pry-byebug', '>= 3.0.0')
+  end
 
-  spec.add_runtime_dependency('sys-proctable', '>= 0.9.2')
+  spec.add_runtime_dependency('sys-proctable', '>= 1.2.2')
   spec.add_runtime_dependency('get_process_mem', '>= 0.2.1')
   spec.add_runtime_dependency('timers', '>= 4.0.0')
-  spec.add_runtime_dependency('oj', '>=3.0.11')
+  spec.add_runtime_dependency('oj', '>=3.0.11') unless RUBY_PLATFORM =~ /java/i
 
   # Indirect dependency
   # https://github.com/instana/ruby-sensor/issues/10

data/lib/instana/agent.rb

@@ -1,4 +1,3 @@
-require 'oj'
 require 'net/http'
 require 'socket'
 require 'sys/proctable'
@@ -50,7 +49,7 @@ module Instana
       @thread_spawn_lock = Mutex.new
 
       # Detect platform flags
-      @is_linux = (RUBY_PLATFORM =~ /linux/i) ? true : false
+      @is_linux = (RbConfig::CONFIG['host_os'] =~ /linux/i) ? true : false
       @is_osx = (RUBY_PLATFORM =~ /darwin/i) ? true : false
 
       # In case we're running in Docker, have the default gateway available
@@ -232,7 +231,7 @@ module Instana
       Instana.logger.debug { e.backtrace.join("\r\n") }
       return false
     ensure
-      socket.close if socket
+      socket.close if socket && !socket.closed?
     end
 
     # Method to report metrics data to the host agent.

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

@@ -41,7 +41,10 @@ module Instana
       end
 
       def execute_with_instana(sql, name = nil)
-        if !::Instana.tracer.tracing? || ignore_payload?(name, sql)
+        tracing = ::Instana.tracer.tracing?
+        if !tracing || ignore_payload?(name, sql)
+          return execute_without_instana(sql, name)
+        elsif ::Instana.tracer.current_span[:n] == :activerecord
           return execute_without_instana(sql, name)
         end
 

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

@@ -11,18 +11,17 @@ if defined?(::ActiveRecord) && ::Instana.config[:active_record][:enabled]
     ::Instana.logger.info "Instrumenting ActiveRecord (mysql)"
     ActiveRecord::ConnectionAdapters::MysqlAdapter.send(:include, ::Instana::Instrumentation::MysqlAdapter)
     ActiveRecord::ConnectionAdapters::AbstractMysqlAdapter.send(:include, ::Instana::Instrumentation::AbstractMysqlAdapter)
+  end
 
   # Mysql2
-  elsif defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
+  if defined?(ActiveRecord::ConnectionAdapters::Mysql2Adapter)
     ::Instana.logger.info "Instrumenting ActiveRecord (mysql2)"
     ActiveRecord::ConnectionAdapters::Mysql2Adapter.send(:include, ::Instana::Instrumentation::Mysql2Adapter)
+  end
 
   # Postgres
-  elsif defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
+  if defined?(ActiveRecord::ConnectionAdapters::PostgreSQLAdapter)
     ::Instana.logger.info "Instrumenting ActiveRecord (postgresql)"
     ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.send(:include, ::Instana::Instrumentation::PostgreSQLAdapter)
-
-  else
-    ::Instana.logger.debug "Unsupported ActiveRecord adapter"
   end
 end

data/lib/instana/setup.rb

@@ -1,3 +1,5 @@
+require 'oj_check'
+
 require "instana/base"
 require "instana/config"
 require "instana/agent"
@@ -10,7 +12,10 @@ require "instana/instrumentation"
 ::Instana.agent.setup
 
 # Register the metric collectors
-require 'instana/collectors/gc'
+unless RUBY_PLATFORM == 'java'.freeze
+  require 'instana/collectors/gc'
+end
+
 require 'instana/collectors/memory'
 require 'instana/collectors/thread'
 

data/lib/instana/version.rb

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

data/lib/oj_check.rb

@@ -0,0 +1,16 @@
+begin
+  require 'oj'
+rescue LoadError => e
+  # OJ is not available in JRuby
+  module Instana
+    class Oj
+      def self.dump(*args)
+        args.first.to_json
+      end
+
+      def self.load(*args)
+        JSON.parse args.first
+      end
+    end
+  end
+end

data/test/agent/agent_test.rb

@@ -1,7 +1,10 @@
 require 'test_helper'
-require 'oj'
+require './lib/oj_check'
 
 class AgentTest < Minitest::Test
+
+  Oj = ::Instana::Oj unless defined?(Oj)
+
   def test_agent_host_detection
     url = "http://#{::Instana.config[:agent_host]}:#{::Instana.config[:agent_port]}/"
     stub_request(:get, url)

data/test/benchmarks/bench_id_generation.rb

@@ -2,6 +2,7 @@ require 'test_helper'
 
 class BenchIDs < Minitest::Benchmark
   def bench_generate_id
+    # TODO: This performs poorly on JRuby.
     assert_performance_constant do |input|
       500_000.times do
         ::Instana::Util.generate_id

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-16 00:00:00.000000000 Z
+date: 2019-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 0.10.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 8.0.0
+        version: 0.10.0
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 8.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.10.0
+        version: 8.0.0
 - !ruby/object:Gem::Dependency
   name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 1.2.2
 - !ruby/object:Gem::Dependency
   name: get_process_mem
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +247,7 @@ files:
 - lib/instana/tracing/span_context.rb
 - lib/instana/util.rb
 - lib/instana/version.rb
+- lib/oj_check.rb
 - lib/opentracing.rb
 - log/.keep
 - test/agent/agent_test.rb