instana 1.11.3 → 1.11.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 964de6b7e7cf62695558794bb80a056a87427f0fc67d6428eaaa1b3bd1e4d7f8
-  data.tar.gz: d9f7d98a110ef3a73024f26050af10f1fde12dda500ec665dfe28062579577dd
+  metadata.gz: 0b2f239d9d7286752e2650375e8096e9525db098a7e5b09486e36dbd89758eb1
+  data.tar.gz: 14ebd785f5ef8333360214ad9731583976f96c62980b6d0b7927338d25a0ca90
 SHA512:
-  metadata.gz: bdb19c8b417c5d22918d3275a1bbfbe956ebd72b2672083b7045e941ea58dccf8d6fea00e5ec17ebf14a95de0e90ce68bbd936119d87f5632a824135f5afc722
-  data.tar.gz: 145abd6cfb3c1c267a3099fe715db07fe8e6d64dd6a0c47a29d7923d90ddfac2b7b7770b229034ef3e5d8c2a8e3b873dacf6ec47e6795690b9dee9625d37c17a
+  metadata.gz: f2e560309027517414f4358421b5e9f0579254e9479cbe263c7fdd89440d924ef416a90ef2b7ff25eb7cbb3bffb3f630338d590363451de877eb9d9c70a46c32
+  data.tar.gz: 0e8612accc07577a4951fddde76e77789714b67ee2e749b167f18ae39f3b8e4947e65fa3f4d35cd7a9af350e9ce65fcec0119f8494760b5f8be855c792cbe229

data/.travis.yml

@@ -6,7 +6,7 @@ cache:
     - vendor/bundle
 
 rvm:
-  - 2.5
+  - 2.6
   - 2.4
 
 before_install:
@@ -30,12 +30,12 @@ gemfile:
   - Gemfile
   - gemfiles/libraries.gemfile
   - gemfiles/rails50.gemfile
+  - gemfiles/rails60.gemfile
 
 matrix:
   exclude:
-    # Rails 5.0+ requires Ruby 2.2.2 or higher
-    - rvm: 2.1.10
-      gemfile: gemfiles/rails50.gemfile
+    - rvm: 2.4
+      gemfile: gemfiles/rails60.gemfile
 
 notifications:
   slack:

data/Rakefile

@@ -12,7 +12,11 @@ Rake::TestTask.new(:test) do |t|
 
   if ENV.key?('BUNDLE_GEMFILE')
     case File.basename(ENV['BUNDLE_GEMFILE']).split('.').first
-    when /rails50/
+    when /rails6/
+      t.test_files = %w(test/frameworks/rails/activerecord_test.rb
+                        test/frameworks/rails/actioncontroller_test.rb
+                        test/frameworks/rails/actionview5_test.rb)
+    when /rails5/
       t.test_files = %w(test/frameworks/rails/activerecord_test.rb
                         test/frameworks/rails/actioncontroller_test.rb
                         test/frameworks/rails/actionview5_test.rb)

data/gemfiles/rails60.gemfile

@@ -0,0 +1,72 @@
+source 'https://rubygems.org'
+git_source(:github) { |repo| "https://github.com/#{repo}.git" }
+
+# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
+gem 'rails', '~> 6.0.2', '>= 6.0.2.1'
+# Use sqlite3 as the database for Active Record
+gem 'sqlite3', '~> 1.4'
+# Use Puma as the app server
+gem 'puma', '~> 4.1'
+# Use SCSS for stylesheets
+gem 'sass-rails', '>= 6'
+# Transpile app-like JavaScript. Read more: https://github.com/rails/webpacker
+gem 'webpacker', '~> 4.0'
+# Turbolinks makes navigating your web application faster. Read more: https://github.com/turbolinks/turbolinks
+gem 'turbolinks', '~> 5'
+# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
+gem 'jbuilder', '~> 2.7'
+# Use Redis adapter to run Action Cable in production
+# gem 'redis', '~> 4.0'
+# Use Active Model has_secure_password
+# gem 'bcrypt', '~> 3.1.7'
+
+gem 'mysql2', '0.4.10'
+
+# Use Active Storage variant
+# gem 'image_processing', '~> 1.2'
+
+# Reduces boot times through caching; required in config/boot.rb
+gem 'bootsnap', '>= 1.4.2', require: false
+
+group :development, :test do
+  # Call 'byebug' anywhere in the code to stop execution and get a debugger console
+  gem 'byebug', platforms: [:mri, :mingw, :x64_mingw]
+end
+
+group :development do
+  # Access an interactive console on exception pages or by calling 'console' anywhere in the code.
+  gem 'web-console', '>= 3.3.0'
+  gem 'listen', '>= 3.0.5', '< 3.2'
+  # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring
+  gem 'spring'
+  gem 'spring-watcher-listen', '~> 2.0.0'
+end
+
+group :test do
+  # Adds support for Capybara system testing and selenium driver
+  gem 'capybara', '>= 2.15'
+  gem 'selenium-webdriver'
+  # Easy installation and use of web drivers to run system tests with browsers
+  gem 'webdrivers'
+end
+
+group :development, :test do
+  gem 'rake'
+  gem 'minitest', '5.9.1'
+  gem 'minitest-reporters'
+  gem 'minitest-debugger', :require => false
+  gem 'rack-test'
+  gem 'webmock'
+  # public_suffix dropped support for Ruby 2.1 and earlier.
+  gem 'public_suffix', '< 3.0'
+end
+
+
+# Windows does not include zoneinfo files, so bundle the tzinfo-data gem
+gem 'tzinfo-data', platforms: [:mingw, :mswin, :x64_mingw, :jruby]
+
+# Include the Instana Ruby gem's base set of gems
+gemspec :path => File.expand_path(File.dirname(__FILE__) + '/../')
+
+
+# vim:syntax=ruby

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

@@ -6,13 +6,13 @@ module Instana
         ::Instana::Util.method_alias(klass, :render_collection)
       end
 
-      def render_partial_with_instana
+      def render_partial_with_instana(*args)
         kv_payload = { :render => {} }
         kv_payload[:render][:type] = :partial
         kv_payload[:render][:name] = @options[:partial].to_s if @options.is_a?(Hash)
 
         ::Instana.tracer.log_entry(:render, kv_payload)
-        render_partial_without_instana
+        render_partial_without_instana(*args)
       rescue Exception => e
         ::Instana.tracer.log_error(e)
         raise
@@ -20,13 +20,13 @@ module Instana
         ::Instana.tracer.log_exit(:render)
       end
 
-      def render_collection_with_instana
+      def render_collection_with_instana(*args)
         kv_payload = { :render => {} }
         kv_payload[:render][:type] = :collection
         kv_payload[:render][:name] = @path.to_s
 
         ::Instana.tracer.log_entry(:render, kv_payload)
-        render_collection_without_instana
+        render_collection_without_instana(*args)
       rescue Exception => e
         ::Instana.tracer.log_error(e)
         raise

data/lib/instana/util.rb

@@ -176,10 +176,14 @@ module Instana
         end
 
         if defined?(::Resque)
+          # Just because Resque is defined doesn't mean this is a resque process necessarily
+          # Check arguments for a match
           if ($0 =~ /resque-#{Resque::Version}/)
             return "Resque Worker"
           elsif ($0 =~ /resque-pool-master/)
             return "Resque Pool Master"
+          elsif ($0 =~ /resque-scheduler/)
+            return "Resque Scheduler"
           end
         end
 
@@ -187,10 +191,20 @@ module Instana
           return Rails.application.class.to_s.split('::')[0]
         end
 
-        return File.basename($0)
+        if $0.to_s.empty?
+          return "Ruby"
+        end
+
+        exe = File.basename($0)
+        if exe == "rake"
+          return "Rake"
+        end
+
+        return exe
       rescue Exception => e
         Instana.logger.info "#{__method__}:#{File.basename(__FILE__)}:#{__LINE__}: #{e.message}"
         Instana.logger.debug { e.backtrace.join("\r\n") }
+        return "Ruby"
       end
 
       # Get the current time in milliseconds from the epoch

data/lib/instana/version.rb

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

data/test/frameworks/rails/actionview5_test.rb

@@ -190,7 +190,7 @@ class ActionViewTest < Minitest::Test
     assert_equal :partial, fourth_span[:data][:render][:type]
     assert_equal 'syntax_error', fourth_span[:data][:render][:name]
     assert fourth_span[:data][:log].key?(:message)
-    assert_equal "SyntaxError", fourth_span[:data][:log][:parameters]
+    assert(fourth_span[:data][:log][:parameters].include?("SyntaxError"))
     assert fourth_span[:error]
     assert fourth_span[:stack]
   end

data/test/models/block6.rb

@@ -0,0 +1,18 @@
+class Block < ActiveRecord::Base
+  def do_work(*args)
+    block = Block.first
+    block.name = "Charlie"
+    block.color = "Black"
+    block.save
+  end
+end
+
+class CreateBlocks < ActiveRecord::Migration[6.0]
+  def change
+    create_table :blocks do |t|
+      t.string :name
+      t.string :color
+      t.timestamps
+    end
+  end
+end

data/test/servers/rails_3205.rb

@@ -8,7 +8,16 @@ end
 require "rails/all"
 require "action_controller/railtie" # require more if needed
 require 'rack/handler/puma'
-require File.expand_path(File.dirname(__FILE__) + '/../models/block')
+
+if Rails::VERSION::STRING >= '6.0'
+  require File.expand_path(File.dirname(__FILE__) + '/../models/block6')
+  system("mkdir -p app/assets/config && echo '{}' > app/assets/config/manifest.js")
+  # Rails 6 Issue: https://github.com/rails/rails/issues/37183
+  class ApplicationController < ActionController::Base
+  end
+else
+  require File.expand_path(File.dirname(__FILE__) + '/../models/block')
+end
 
 ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
 

data/test/test_helper.rb

@@ -25,7 +25,7 @@ allowed_sites = lambda{|uri|
 require "./test/servers/rackapp_6511"
 
 case File.basename(ENV['BUNDLE_GEMFILE'])
-when /rails50|rails42|rails32/
+when /rails/
   require './test/servers/rails_3205'
 when /libraries/
   # Configure gRPC

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.11.3
+  version: 1.11.4
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -201,6 +201,7 @@ files:
 - gemfiles/rails42.gemfile
 - gemfiles/rails50.gemfile
 - gemfiles/rails52.gemfile
+- gemfiles/rails60.gemfile
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/agent.rb
@@ -285,6 +286,7 @@ files:
 - test/jobs/sidekiq_job_1.rb
 - test/jobs/sidekiq_job_2.rb
 - test/models/block.rb
+- test/models/block6.rb
 - test/servers/grpc_50051.rb
 - test/servers/helpers/sidekiq_worker_initializer.rb
 - test/servers/rackapp_6511.rb
@@ -334,6 +336,7 @@ test_files:
 - test/tracing/tracer_async_test.rb
 - test/agent/agent_test.rb
 - test/models/block.rb
+- test/models/block6.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb