instana 1.10.8 → 1.10.9

data/test/frameworks/rails/activerecord_test.rb

@@ -0,0 +1,227 @@
+require 'test_helper'
+require 'active_record'
+
+class ActiveRecordTest < Minitest::Test
+  def test_config_defaults
+    assert ::Instana.config[:active_record].is_a?(Hash)
+    assert ::Instana.config[:active_record].key?(:enabled)
+    assert_equal true, ::Instana.config[:active_record][:enabled]
+  end
+
+  def test_postgresql
+    skip unless ::Instana::Test.postgresql?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
+
+    spans = Instana.processor.queued_spans
+    assert_equal 6, spans.length
+    rack_span = find_first_span_by_name(spans, :rack)
+
+    ar_spans = find_spans_by_name(spans, :activerecord)
+    assert_equal 3, ar_spans.length
+
+    ar_spans.each do |span|
+      assert_equal "postgresql", span[:data][:activerecord][:adapter]
+      assert span[:data][:activerecord].key?(:host)
+      assert span[:data][:activerecord].key?(:username)
+    end
+
+
+    found = false
+    if ::Rails::VERSION::MAJOR < 4
+      sql = "INSERT INTO \"blocks\" (\"color\", \"created_at\", \"name\", \"updated_at\") VALUES ($?, $?, $?, $?) RETURNING \"id\""
+    else
+      sql = "INSERT INTO \"blocks\" (\"name\", \"color\", \"created_at\", \"updated_at\") VALUES ($?, $?, $?, $?) RETURNING \"id\""
+    end
+    ar_spans.each do |span|
+      if span[:data][:activerecord][:sql] ==
+        found = true
+      end
+    end
+    assert found
+
+    found = false
+    if ::Rails::VERSION::MAJOR >= 5
+      sql = "SELECT  \"blocks\".* FROM \"blocks\" WHERE \"blocks\".\"name\" = $? ORDER BY \"blocks\".\"id\" ASC LIMIT $?"
+    elsif ::Rails::VERSION::MAJOR == 4
+      sql = "SELECT  \"blocks\".* FROM \"blocks\" WHERE \"blocks\".\"name\" = $?  ORDER BY \"blocks\".\"id\" ASC LIMIT ?"
+    else
+      sql = "SELECT  \"blocks\".* FROM \"blocks\"  WHERE \"blocks\".\"name\" = ? LIMIT ?"
+    end
+    ar_spans.each do |span|
+      if span[:data][:activerecord][:sql] == sql
+        found = true
+      end
+    end
+    assert found
+
+    found = false
+    if ::Rails::VERSION::MAJOR == 3
+      sql = "DELETE FROM \"blocks\" WHERE \"blocks\".\"id\" = ?"
+    else
+      sql = "DELETE FROM \"blocks\" WHERE \"blocks\".\"id\" = $?"
+    end
+    ar_spans.each do |span|
+      if span[:data][:activerecord][:sql] == sql
+        found = true
+      end
+    end
+    assert found
+  end
+
+  def test_postgresql_lock_table
+    skip unless ::Instana::Test.postgresql?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db_lock_table'))
+
+    spans = Instana.processor.queued_spans
+    assert_equal 5, spans.length
+
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+    av_span = find_first_span_by_name(spans, :actionview)
+
+    ar_spans = find_spans_by_name(spans, :activerecord)
+    assert_equal 2, ar_spans.length
+
+    ar_spans.each do |ar_span|
+      assert_equal "postgresql", ar_span[:data][:activerecord][:adapter]
+      assert_equal "postgres", ar_span[:data][:activerecord][:username]
+    end
+
+    found = false
+    ar_spans.each do |span|
+      if span[:data][:activerecord][:sql] == "LOCK blocks IN ACCESS EXCLUSIVE MODE"
+        found = true
+      end
+    end
+    assert found
+
+    found = false
+    ar_spans.each do |span|
+      if span[:data][:activerecord][:sql] == "SELECT ?"
+        found = true
+      end
+    end
+    assert found
+  end
+
+  def test_postgresql_raw_execute
+    skip unless ::Instana::Test.postgresql?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db_raw_execute'))
+
+    spans = Instana.processor.queued_spans
+
+    assert_equal 4, spans.length
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+    av_span = find_first_span_by_name(spans, :actionview)
+    ar_span = find_first_span_by_name(spans, :activerecord)
+
+    assert_equal "SELECT ?", ar_span[:data][:activerecord][:sql]
+    assert_equal "postgresql", ar_span[:data][:activerecord][:adapter]
+    assert_equal "postgres", ar_span[:data][:activerecord][:username]
+  end
+
+  def test_postgresql_raw_execute_error
+    skip unless ::Instana::Test.postgresql?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db_raw_execute_error'))
+
+    spans = Instana.processor.queued_spans
+
+    assert_equal 3, spans.length
+    rack_span = find_first_span_by_name(spans, :rack)
+    ac_span = find_first_span_by_name(spans, :actioncontroller)
+    ar_span = find_first_span_by_name(spans, :activerecord)
+
+    assert ar_span.key?(:stack)
+    assert ar_span[:data][:activerecord].key?(:error)
+    assert ar_span[:data][:activerecord][:error].include?("syntax error")
+    assert_equal "This is not real SQL but an intended error", ar_span[:data][:activerecord][:sql]
+    assert_equal "postgresql", ar_span[:data][:activerecord][:adapter]
+    assert_equal "postgres", ar_span[:data][:activerecord][:username]
+  end
+
+  def test_mysql2
+    skip unless ::Instana::Test.mysql2?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
+
+    spans = Instana.processor.queued_spans
+    assert_equal 6, spans.length
+    rack_span = find_first_span_by_name(spans, :rack)
+
+    ar_spans = find_spans_by_name(spans, :activerecord)
+    assert_equal 3, ar_spans.length
+
+    ar_spans.each do |span|
+      assert_equal "mysql2", span[:data][:activerecord][:adapter]
+      assert span[:data][:activerecord].key?(:host)
+      assert span[:data][:activerecord].key?(:username)
+    end
+
+    queries = [
+        "INSERT INTO `blocks` (`name`, `color`, `created_at`, `updated_at`) VALUES (?, ?, ?, ?)",
+        "SELECT  `blocks`.* FROM `blocks` WHERE `blocks`.`name` = ?  ORDER BY `blocks`.`id` ASC LIMIT ?",
+        "DELETE FROM `blocks` WHERE `blocks`.`id` = ?"
+    ]
+
+    queries.each do |sql|
+      found = false
+      ar_spans.each do |span|
+        if span[:data][:activerecord][:sql] = sql
+          found = true
+        end
+      end
+      assert found
+    end
+  end
+
+  def test_mysql
+    skip unless ::Instana::Test.mysql?
+
+    clear_all!
+
+    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
+
+    spans = Instana.processor.queued_spans
+    assert_equal 6, spans.length
+    first_span = spans[0]
+    second_span = spans[2]
+    third_span = spans[3]
+    fourth_span = spans[4]
+
+    assert_equal :rack, first_span[:n]
+    assert_equal :activerecord, second_span[:n]
+    assert_equal :activerecord, third_span[:n]
+    assert_equal :activerecord, fourth_span[:n]
+
+    assert_equal "INSERT INTO `blocks` (`name`, `color`, `created_at`, `updated_at`) VALUES (?, ?, ?, ?)", second_span[:data][:activerecord][:sql]
+    assert_equal "SELECT  `blocks`.* FROM `blocks` WHERE `blocks`.`name` = ?  ORDER BY `blocks`.`id` ASC LIMIT ?", third_span[:data][:activerecord][:sql]
+    assert_equal "DELETE FROM `blocks` WHERE `blocks`.`id` = ?", fourth_span[:data][:activerecord][:sql]
+
+    assert_equal "mysql", second_span[:data][:activerecord][:adapter]
+    assert_equal "mysql", third_span[:data][:activerecord][:adapter]
+    assert_equal "mysql", fourth_span[:data][:activerecord][:adapter]
+
+    assert_equal ENV['TRAVIS_MYSQL_HOST'], second_span[:data][:activerecord][:host]
+    assert_equal ENV['TRAVIS_MYSQL_HOST'], third_span[:data][:activerecord][:host]
+    assert_equal ENV['TRAVIS_MYSQL_HOST'], fourth_span[:data][:activerecord][:host]
+
+    assert_equal ENV['TRAVIS_MYSQL_USER'], second_span[:data][:activerecord][:username]
+    assert_equal ENV['TRAVIS_MYSQL_USER'], third_span[:data][:activerecord][:username]
+    assert_equal ENV['TRAVIS_MYSQL_USER'], fourth_span[:data][:activerecord][:username]
+  end
+end

data/test/servers/rails_3205.rb

@@ -22,18 +22,21 @@ end
 
 class RailsTestApp < Rails::Application
   routes.append do
-    get "/test/world"              => "test#world"
-    get "/test/db"                 => "test#db"
-    get "/test/error"              => "test#error"
-    get "/test/render_view"        => "test#render_view"
-    get "/test/render_partial"     => "test#render_partial"
-    get "/test/render_collection"  => "test#render_collection"
-    get "/test/render_file"        => "test#render_file"
-    get "/test/render_nothing"     => "test#render_nothing"
-    get "/test/render_json"        => "test#render_json"
-    get "/test/render_xml"         => "test#render_xml"
-    get "/test/render_rawbody"     => "test#render_rawbody"
-    get "/test/render_js"          => "test#render_js"
+    get "/test/world"                 => "test#world"
+    get "/test/db"                    => "test#db"
+    get "/test/db_lock_table"         => "test#db_lock_table"
+    get "/test/db_raw_execute"        => "test#db_raw_execute"
+    get "/test/db_raw_execute_error"  => "test#db_raw_execute_error"
+    get "/test/error"                 => "test#error"
+    get "/test/render_view"           => "test#render_view"
+    get "/test/render_partial"        => "test#render_partial"
+    get "/test/render_collection"     => "test#render_collection"
+    get "/test/render_file"           => "test#render_file"
+    get "/test/render_nothing"        => "test#render_nothing"
+    get "/test/render_json"           => "test#render_json"
+    get "/test/render_xml"            => "test#render_xml"
+    get "/test/render_rawbody"        => "test#render_rawbody"
+    get "/test/render_js"             => "test#render_js"
     get "/test/render_alternate_layout"        => "test#render_alternate_layout"
     get "/test/render_partial_that_errors"     => "test#render_partial_that_errors"
 
@@ -82,6 +85,39 @@ class TestController < ActionController::Base
     end
   end
 
+  def db_raw_execute
+    ActiveRecord::Base.connection.execute("SELECT 1")
+
+    if ::Rails::VERSION::MAJOR > 4
+      render :plain => "Hello test db!"
+    else
+      render :text => "Hello test db!"
+    end
+  end
+
+  def db_raw_execute_error
+    ActiveRecord::Base.connection.execute("This is not real SQL but an intended error")
+
+    if ::Rails::VERSION::MAJOR > 4
+      render :plain => "Hello test db!"
+    else
+      render :text => "Hello test db!"
+    end
+  end
+
+  def db_lock_table
+    ActiveRecord::Base.transaction do
+      ActiveRecord::Base.connection.execute('LOCK blocks IN ACCESS EXCLUSIVE MODE')
+      ActiveRecord::Base.connection.execute("SELECT 1")
+    end
+
+    if ::Rails::VERSION::MAJOR > 4
+      render :plain => "Hello test db!"
+    else
+      render :text => "Hello test db!"
+    end
+  end
+
   def render_view
     @message = "Hello Instana!"
   end

data/test/test_helper.rb

@@ -142,4 +142,23 @@ def find_span_by_id(spans, id)
     end
   end
   raise Exception.new("Span with id (#{id}) not found")
+end
+
+# Finds the first span in +spans+ for which +block+ returns true
+#
+#     ar_span = find_first_span_by_qualifier(ar_spans) do |span|
+#       span[:data][:activerecord][:sql] == sql
+#     end
+#
+# This helper will raise an exception if no span evaluates to true against he provided block.
+#
+# +spans+: +Array+ of spans to search
+# +block+: The Ruby block to evaluate against each span
+def find_first_span_by_qualifier(spans, &block)
+  spans.each do |span|
+    if block.call(span)
+      return span
+    end
+  end
+  raise Exception.new("Span with qualifier not found")
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.10.8
+  version: 1.10.9
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -194,6 +194,7 @@ files:
 - bin/setup
 - examples/opentracing.rb
 - examples/tracing.rb
+- gemfiles/.bundle/config
 - gemfiles/libraries.gemfile
 - gemfiles/rails32.gemfile
 - gemfiles/rails42.gemfile
@@ -265,9 +266,7 @@ files:
 - 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/rails/activerecord_test.rb
 - test/frameworks/roda_test.rb
 - test/frameworks/sinatra_test.rb
 - test/instana_test.rb
@@ -316,7 +315,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Ruby Distributed Tracing & Metrics Sensor for Instana
@@ -351,12 +350,10 @@ test_files:
 - 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/activerecord_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

data/test/frameworks/rails/activerecord3_test.rb

@@ -1,134 +0,0 @@
-require 'test_helper'
-require 'active_record'
-
-class ActiveRecordTest < Minitest::Test
-  def test_config_defaults
-    assert ::Instana.config[:active_record].is_a?(Hash)
-    assert ::Instana.config[:active_record].key?(:enabled)
-    assert_equal true, ::Instana.config[:active_record][:enabled]
-  end
-
-  def test_postgresql
-    # Make one call to warm up the Rails stack and allow it to load
-    # relations
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
-
-    skip unless ::Instana::Test.postgresql?
-
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
-
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 6, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[2]
-    third_span = spans[3]
-    fourth_span = spans[4]
-
-    assert_equal :rack, first_span.name
-    assert_equal :activerecord, second_span.name
-    assert_equal :activerecord, third_span.name
-    assert_equal :activerecord, fourth_span.name
-
-    assert_equal "INSERT INTO \"blocks\" (\"color\", \"created_at\", \"name\", \"updated_at\") VALUES ($?, $?, $?, $?) RETURNING \"id\"", second_span[:data][:activerecord][:sql]
-    assert_equal "SELECT  \"blocks\".* FROM \"blocks\"  WHERE \"blocks\".\"name\" = ? LIMIT ?", third_span[:data][:activerecord][:sql]
-    assert_equal "DELETE FROM \"blocks\" WHERE \"blocks\".\"id\" = ?", fourth_span[:data][:activerecord][:sql]
-
-    assert_equal "postgresql", second_span[:data][:activerecord][:adapter]
-    assert_equal "postgresql", third_span[:data][:activerecord][:adapter]
-    assert_equal "postgresql", fourth_span[:data][:activerecord][:adapter]
-
-    assert_equal ENV['TRAVIS_PSQL_HOST'], second_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_PSQL_HOST'], third_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_PSQL_HOST'], fourth_span[:data][:activerecord][:host]
-
-    assert_equal "postgres", second_span[:data][:activerecord][:username]
-    assert_equal "postgres", third_span[:data][:activerecord][:username]
-    assert_equal "postgres", fourth_span[:data][:activerecord][:username]
-  end
-
-  def test_mysql2
-    skip unless ::Instana::Test.mysql2?
-
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
-
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 6, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[2]
-    third_span = spans[3]
-    fourth_span = spans[4]
-
-    assert_equal :rack, first_span.name
-    assert_equal :activerecord, second_span.name
-    assert_equal :activerecord, third_span.name
-    assert_equal :activerecord, fourth_span.name
-
-    assert_equal "INSERT INTO `blocks` (`color`, `created_at`, `name`, `updated_at`) VALUES (?, ?, ?, ?)", second_span[:data][:activerecord][:sql]
-    assert_equal "SELECT  `blocks`.* FROM `blocks`  WHERE `blocks`.`name` = ? LIMIT ?", third_span[:data][:activerecord][:sql]
-    assert_equal "DELETE FROM `blocks` WHERE `blocks`.`id` = ?", fourth_span[:data][:activerecord][:sql]
-
-    assert_equal "mysql2", second_span[:data][:activerecord][:adapter]
-    assert_equal "mysql2", third_span[:data][:activerecord][:adapter]
-    assert_equal "mysql2", fourth_span[:data][:activerecord][:adapter]
-
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], second_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], third_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], fourth_span[:data][:activerecord][:host]
-
-    assert_equal ENV['TRAVIS_MYSQL_USER'], second_span[:data][:activerecord][:username]
-    assert_equal ENV['TRAVIS_MYSQL_USER'], third_span[:data][:activerecord][:username]
-    assert_equal ENV['TRAVIS_MYSQL_USER'], fourth_span[:data][:activerecord][:username]
-  end
-
-  def test_mysql
-    skip unless ::Instana::Test.mysql?
-
-    clear_all!
-
-    Net::HTTP.get(URI.parse('http://localhost:3205/test/db'))
-
-    traces = Instana.processor.queued_traces
-    assert_equal 1, traces.length
-    trace = traces.first
-
-    assert_equal 6, trace.spans.length
-    spans = trace.spans.to_a
-    first_span = spans[0]
-    second_span = spans[2]
-    third_span = spans[3]
-    fourth_span = spans[4]
-
-    assert_equal :rack, first_span.name
-    assert_equal :activerecord, second_span.name
-    assert_equal :activerecord, third_span.name
-    assert_equal :activerecord, fourth_span.name
-
-    assert_equal "INSERT INTO `blocks` (`color`, `created_at`, `name`, `updated_at`) VALUES (?, ?, ?, ?)", second_span[:data][:activerecord][:sql]
-    assert_equal "SELECT  `blocks`.* FROM `blocks`  WHERE `blocks`.`name` = ? LIMIT ?", third_span[:data][:activerecord][:sql]
-    assert_equal "DELETE FROM `blocks` WHERE `blocks`.`id` = ?", fourth_span[:data][:activerecord][:sql]
-
-    assert_equal "mysql", second_span[:data][:activerecord][:adapter]
-    assert_equal "mysql", third_span[:data][:activerecord][:adapter]
-    assert_equal "mysql", fourth_span[:data][:activerecord][:adapter]
-
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], second_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], third_span[:data][:activerecord][:host]
-    assert_equal ENV['TRAVIS_MYSQL_HOST'], fourth_span[:data][:activerecord][:host]
-
-    assert_equal ENV['TRAVIS_MYSQL_USER'], second_span[:data][:activerecord][:username]
-    assert_equal ENV['TRAVIS_MYSQL_USER'], third_span[:data][:activerecord][:username]
-    assert_equal ENV['TRAVIS_MYSQL_USER'], fourth_span[:data][:activerecord][:username]
-  end
-end