instana 1.193.4 → 1.195.2

data/test/instrumentation/rails_action_controller_test.rb

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

data/test/instrumentation/rails_action_view_test.rb

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

data/test/instrumentation/rails_active_record_test.rb

@@ -1,8 +1,9 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'test_helper'
 require 'support/apps/active_record/active_record'
 
-require 'irb'
-
 class RailsActiveRecordTest < Minitest::Test
   def setup
     skip unless ENV['DATABASE_URL']

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/shoryuken_test.rb

@@ -0,0 +1,47 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+require 'ostruct'
+
+class ShoryukenTest < Minitest::Test
+  def setup
+    clear_all!
+    @middleware = Instana::Instrumentation::Shoryuken.new
+  end
+
+  def test_start_trace_with_context
+    id = Instana::Util.generate_id
+    message = OpenStruct.new(
+      queue_url: 'http://example.com',
+      message_attributes: {
+        "X_INSTANA_T" => OpenStruct.new(string_value: id),
+        "X_INSTANA_S" => OpenStruct.new(string_value: id),
+        "X_INSTANA_L" => OpenStruct.new(string_value: '1')
+      }
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_equal id, span[:t]
+    assert_equal id, span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+
+  def test_start_trace
+    message = OpenStruct.new(
+      queue_url: 'http://example.com'
+    )
+
+    @middleware.call(nil, nil, message, nil) {}
+
+    span = ::Instana.processor.queued_spans.first
+
+    assert_nil span[:p]
+    assert_equal 'entry', span[:data][:sqs][:sort]
+    assert_equal 'http://example.com', span[:data][:sqs][:queue]
+  end
+end

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

@@ -1,3 +1,6 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
 require 'rails'
 require 'active_record/railtie'
 

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.4
+  version: 1.195.2
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-08 00:00:00.000000000 Z
+date: 2021-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -153,7 +153,6 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - Appraisals
-- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -168,12 +167,17 @@ files:
 - benchmarks/time_processing.rb
 - bin/console
 - bin/setup
+- docker-compose.yml
 - 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
+- gemfiles/excon_021.gemfile
+- gemfiles/excon_079.gemfile
 - gemfiles/graphql_10.gemfile
 - gemfiles/grpc_10.gemfile
 - gemfiles/net_http_01.gemfile
@@ -190,16 +194,22 @@ files:
 - gemfiles/rest_client_20.gemfile
 - gemfiles/roda_20.gemfile
 - gemfiles/roda_30.gemfile
+- gemfiles/shoryuken_50.gemfile
 - gemfiles/sidekiq_42.gemfile
 - gemfiles/sidekiq_50.gemfile
 - gemfiles/sinatra_14.gemfile
 - 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/aws_sdk_s3.rb
+- lib/instana/activators/aws_sdk_sns.rb
+- lib/instana/activators/aws_sdk_sqs.rb
 - lib/instana/activators/cuba.rb
 - lib/instana/activators/dalli.rb
 - lib/instana/activators/excon.rb
@@ -214,6 +224,7 @@ files:
 - lib/instana/activators/resque_worker.rb
 - lib/instana/activators/rest_client.rb
 - lib/instana/activators/roda.rb
+- lib/instana/activators/shoryuken.rb
 - lib/instana/activators/sidekiq_client.rb
 - lib/instana/activators/sidekiq_worker.rb
 - lib/instana/activators/sinatra.rb
@@ -234,9 +245,14 @@ files:
 - 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/aws_sdk_s3.rb
+- lib/instana/instrumentation/aws_sdk_sns.rb
+- lib/instana/instrumentation/aws_sdk_sqs.rb
 - lib/instana/instrumentation/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/graphql.rb
@@ -247,6 +263,7 @@ files:
 - lib/instana/instrumentation/redis.rb
 - lib/instana/instrumentation/resque.rb
 - lib/instana/instrumentation/rest-client.rb
+- lib/instana/instrumentation/shoryuken.rb
 - lib/instana/instrumentation/sidekiq-client.rb
 - lib/instana/instrumentation/sidekiq-worker.rb
 - lib/instana/opentracing/carrier.rb
@@ -273,6 +290,7 @@ files:
 - 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
@@ -280,12 +298,14 @@ 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/shoryuken_test.rb
 - test/instrumentation/sidekiq-client_test.rb
 - test/instrumentation/sidekiq-worker_test.rb
 - test/secrets_test.rb
@@ -357,11 +377,14 @@ test_files:
 - test/instrumentation/rails_action_view_test.rb
 - test/instrumentation/rack_test.rb
 - test/instrumentation/rack_instrumented_request_test.rb
+- test/instrumentation/shoryuken_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