instana 1.193.5 → 1.195.3

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/tracing/opentracing_test.rb

@@ -304,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
@@ -331,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.193.5
+  version: 1.195.3
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-03-23 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,13 +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
@@ -191,6 +194,7 @@ 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
@@ -202,6 +206,10 @@ files:
 - 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
@@ -216,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
@@ -240,6 +249,10 @@ files:
 - 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
@@ -250,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
@@ -276,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
@@ -290,6 +305,7 @@ files:
 - 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
@@ -361,12 +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

data/Dockerfile

@@ -1,16 +0,0 @@
-# For development/testing, you can run this instrumentation
-# interactively in a Docker container:
-# docker build -t instana/ruby-sensor:1.0
-#
-# To mount the host ruby-sensor directory in the container:
-# docker run -v /host/path/to/ruby-sensor:/ruby-sensor instana/ruby-sensor:1.0 /bin/bash
-#
-# Once inside the container, you can run `cd /ruby-sensor && bundle install && bundle exec rake console` for a development
-# console in the gem.
-#
-# https://github.com/instana/ruby-sensor#development
-#
-FROM ruby:2.6
-ENV INSTANA_DEBUG=true
-RUN gem install bundler
-RUN apt update && apt install -y vim