instana 1.193.3.pre1 → 1.195.0

data/test/instrumentation/rails_active_record_test.rb

@@ -0,0 +1,122 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'support/apps/active_record/active_record'
+
+class RailsActiveRecordTest < Minitest::Test
+  def setup
+    skip unless ENV['DATABASE_URL']
+    @connection = ActiveRecord::Base.establish_connection(ENV['DATABASE_URL'])
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.run(CreateBlocks, direction: :up)
+    end
+  end
+
+  def teardown
+    ActiveRecord::Migration.suppress_messages do
+      ActiveRecord::Migration.run(CreateBlocks, direction: :down)
+    end
+    ActiveRecord::Base.remove_connection(@connection)
+  end
+
+  def test_config_defaults
+    assert ::Instana.config[:sanitize_sql] == true
+    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_create
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      Block.create(name: 'core', color: 'blue')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('INSERT INTO')
+    assert 'core', data[:binds][0]
+    assert 'blue', data[:binds][1]
+  end
+
+  def test_read
+    Block.create(name: 'core', color: 'blue')
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      Block.find_by(name: 'core')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('SELECT')
+    assert 'core', data[:binds][0]
+    assert 1, data[:binds][1]
+  end
+
+  def test_update
+    Block.create(name: 'core', color: 'blue')
+    b = Block.find_by(name: 'core')
+
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      b.color = 'red'
+      b.save
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('UPDATE')
+    assert 'red', data[:binds][0]
+    assert 1, data[:binds][2]
+  end
+
+  def test_delete
+    b = Block.create(name: 'core', color: 'blue')
+
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      b.delete
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert data[:sql].start_with?('DELETE')
+    assert 1, data[:binds][0]
+  end
+
+  def test_raw
+    Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+      ActiveRecord::Base.connection.execute('SELECT 1')
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+    data = span[:data][:activerecord]
+
+    assert 'SELECT 1', data[:sql]
+  end
+
+  def test_raw_error
+    assert_raises ActiveRecord::StatementInvalid do
+      Instana::Tracer.start_or_continue_trace(:ar_test, {}) do
+        ActiveRecord::Base.connection.execute('INVALID')
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    assert_equal 2, spans.length
+    span = find_first_span_by_name(spans, :activerecord)
+
+    assert_equal 1, span[:ec]
+  end
+end

data/test/instrumentation/redis_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 
 class RedisTest < Minitest::Test

data/test/instrumentation/resque_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2018
+
 require 'test_helper'
 require 'support/apps/resque/boot'
 

data/test/instrumentation/rest_client_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 require 'support/apps/http_endpoint/boot'
 

data/test/instrumentation/sidekiq-client_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 require 'support/apps/sidekiq/boot'
 

data/test/instrumentation/sidekiq-worker_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 require 'support/apps/sidekiq/boot'
 

data/test/secrets_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 
 class SecretsTest < Minitest::Test

data/test/support/apps/active_record/active_record.rb

@@ -0,0 +1,24 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'rails'
+require 'active_record/railtie'
+
+migration_class = if ActiveRecord::Migration.respond_to?(:[])
+                    ActiveRecord::Migration[4.2]
+                  else
+                    ActiveRecord::Migration
+                  end
+
+class CreateBlocks < migration_class
+  def change
+    create_table :blocks do |t|
+      t.string :name
+      t.string :color
+      t.timestamps
+    end
+  end
+end
+
+class Block < ActiveRecord::Base
+end

data/test/support/apps/grpc/boot.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require_relative 'grpc_server'
 
 ::Instana.logger.info "Booting instrumented gRPC server on port 50051 for tests."

data/test/support/apps/grpc/grpc_server.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do

data/test/support/apps/http_endpoint/boot.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'rack/handler/puma'
 require 'rack/builder'
 require 'instana/rack'

data/test/support/apps/rails/boot.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 ::Instana.logger.warn "Starting background Ruby on Rails #{Rails::VERSION::STRING} application on port 3205"
 
 require "rails"

data/test/support/apps/rails/models/block.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 class Block < ActiveRecord::Base
   def do_work(*args)
     block = Block.first

data/test/support/apps/rails/models/block6.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 class Block < ActiveRecord::Base
   def do_work(*args)
     block = Block.first

data/test/support/apps/resque/boot.rb

@@ -1,2 +1,5 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require_relative 'jobs/resque_error_job'
 require_relative 'jobs/resque_fast_job'

data/test/support/apps/resque/jobs/resque_error_job.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2018
+
 require "redis"
 require "net/http"
 

data/test/support/apps/resque/jobs/resque_fast_job.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2018
+
 require "redis"
 require "net/http"
 

data/test/support/apps/sidekiq/boot.rb

@@ -1,4 +1,8 @@
 # Hook into sidekiq to control the current mode
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 $sidekiq_mode = :client
 class << Sidekiq
   def server?

data/test/support/apps/sidekiq/jobs/sidekiq_job_1.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 class SidekiqJobOne
   include Sidekiq::Worker
 

data/test/support/apps/sidekiq/jobs/sidekiq_job_2.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 class SidekiqJobTwo
   include Sidekiq::Worker
 

data/test/support/apps/sidekiq/worker.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'sidekiq/launcher'
 require 'sidekiq/cli'
 require 'sidekiq/api'

data/test/support/helpers.rb

@@ -1,5 +1,8 @@
 # frozen_string_literal: true
 
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 module Instana
   module TestHelpers
     # Used to reset the gem to boot state.  It clears out any queued and/or staged

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 ENV['INSTANA_TEST'] = 'true'
 
 begin

data/test/tracing/custom_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class CustomTracingTest < Minitest::Test

data/test/tracing/id_management_test.rb

@@ -1,4 +1,8 @@
 
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class TracerIDMgmtTest < Minitest::Test

data/test/tracing/opentracing_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2017
+
 require 'test_helper'
 require 'rack/test'
 require 'rack/lobster'
@@ -301,7 +304,7 @@ class OpenTracerTest < Minitest::Test
     assert_equal second_span[:s], third_span[:p]
 
     # Every span should have baggage
-    assert_equal(nil, entry_span.context.baggage)
+    assert_equal({}, entry_span.context.baggage)
     assert_equal({:my_bag=>1}, ac_span.context.baggage)
     assert_equal({:my_bag=>1}, av_span.context.baggage)
   end
@@ -328,9 +331,9 @@ class OpenTracerTest < Minitest::Test
     spans = ::Instana.processor.queued_spans
     assert_equal 3, spans.length
 
-    assert_equal(nil, entry_span.context.baggage)
+    assert_equal({}, entry_span.context.baggage)
     assert_equal({:my_bag=>1}, ac_span.context.baggage)
-    assert_equal(nil, av_span.context.baggage)
+    assert_equal({}, av_span.context.baggage)
   end
 
   def test_start_active_span

data/test/tracing/tracer_async_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class TracerAsyncTest < Minitest::Test

data/test/tracing/tracer_test.rb

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2016
+
 require 'test_helper'
 
 class TracerTest < Minitest::Test

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.193.3.pre1
+  version: 1.195.0
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-02 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -170,7 +170,9 @@ files:
 - bin/setup
 - examples/opentracing.rb
 - examples/tracing.rb
+- extras/license_header.rb
 - gemfiles/.bundle/config
+- gemfiles/aws_30.gemfile
 - gemfiles/cuba_30.gemfile
 - gemfiles/dalli_20.gemfile
 - gemfiles/excon_02.gemfile
@@ -196,6 +198,12 @@ files:
 - instana.gemspec
 - lib/instana.rb
 - lib/instana/activator.rb
+- lib/instana/activators/action_cable.rb
+- lib/instana/activators/action_controller_api.rb
+- lib/instana/activators/action_controller_base.rb
+- lib/instana/activators/action_view.rb
+- lib/instana/activators/active_record.rb
+- lib/instana/activators/aws_sdk_dynamodb.rb
 - lib/instana/activators/cuba.rb
 - lib/instana/activators/dalli.rb
 - lib/instana/activators/excon.rb
@@ -226,17 +234,15 @@ files:
 - lib/instana/eum/eum-test.js.erb
 - lib/instana/eum/eum.js.erb
 - lib/instana/frameworks/cuba.rb
-- lib/instana/frameworks/instrumentation/abstract_mysql_adapter.rb
-- lib/instana/frameworks/instrumentation/action_controller.rb
-- lib/instana/frameworks/instrumentation/action_view.rb
-- lib/instana/frameworks/instrumentation/active_record.rb
-- lib/instana/frameworks/instrumentation/mysql2_adapter.rb
-- lib/instana/frameworks/instrumentation/mysql_adapter.rb
-- lib/instana/frameworks/instrumentation/postgresql_adapter.rb
 - lib/instana/frameworks/rails.rb
 - lib/instana/frameworks/roda.rb
 - lib/instana/frameworks/sinatra.rb
 - lib/instana/helpers.rb
+- lib/instana/instrumentation/action_cable.rb
+- lib/instana/instrumentation/action_controller.rb
+- lib/instana/instrumentation/action_view.rb
+- lib/instana/instrumentation/active_record.rb
+- lib/instana/instrumentation/aws_sdk_dynamodb.rb
 - lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/graphql.rb
@@ -270,15 +276,10 @@ files:
 - test/benchmarks/bench_opentracing.rb
 - test/config_test.rb
 - test/frameworks/cuba_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/activerecord_test.rb
-- test/frameworks/rails_test.rb
 - test/frameworks/roda_test.rb
 - test/frameworks/sinatra_test.rb
 - test/instana_test.rb
+- test/instrumentation/aws_test.rb
 - test/instrumentation/dalli_test.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/graphql_test.rb
@@ -286,12 +287,17 @@ files:
 - test/instrumentation/net_http_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
 - test/instrumentation/rack_test.rb
+- test/instrumentation/rails_action_cable_test.rb
+- test/instrumentation/rails_action_controller_test.rb
+- test/instrumentation/rails_action_view_test.rb
+- test/instrumentation/rails_active_record_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/secrets_test.rb
+- test/support/apps/active_record/active_record.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
 - test/support/apps/http_endpoint/boot.rb
@@ -331,9 +337,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.2.6
 signing_key: 
@@ -351,16 +357,21 @@ test_files:
 - test/secrets_test.rb
 - test/instrumentation/graphql_test.rb
 - test/instrumentation/sidekiq-client_test.rb
+- test/instrumentation/rails_action_controller_test.rb
 - test/instrumentation/rest_client_test.rb
 - test/instrumentation/net_http_test.rb
 - test/instrumentation/resque_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
+- test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
+- test/instrumentation/rails_active_record_test.rb
 - test/instrumentation/redis_test.rb
 - test/instrumentation/dalli_test.rb
+- test/instrumentation/rails_action_cable_test.rb
 - test/instrumentation/excon_test.rb
 - test/instrumentation/grpc_test.rb
+- test/instrumentation/aws_test.rb
 - test/support/helpers.rb
 - test/support/apps/sidekiq/boot.rb
 - test/support/apps/sidekiq/jobs/sidekiq_job_2.rb
@@ -368,6 +379,7 @@ test_files:
 - test/support/apps/sidekiq/worker.rb
 - test/support/apps/grpc/boot.rb
 - test/support/apps/grpc/grpc_server.rb
+- test/support/apps/active_record/active_record.rb
 - test/support/apps/resque/boot.rb
 - test/support/apps/resque/jobs/resque_error_job.rb
 - test/support/apps/resque/jobs/resque_fast_job.rb
@@ -380,11 +392,5 @@ test_files:
 - test/test_helper.rb
 - test/frameworks/cuba_test.rb
 - test/frameworks/roda_test.rb
-- test/frameworks/rails_test.rb
 - test/frameworks/sinatra_test.rb
-- test/frameworks/rails/actionview4_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/instana_test.rb