instana 1.193.5 → 1.193.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3a4bd641fb11b956073bc9d424e61e1425382ed0bd3e92fcb1c00223e07f8202
-  data.tar.gz: 8f8627a078613dd16adcf67a37f5eacf163c21a34b3d6172f05f831d833720f0
+  metadata.gz: db77f1675976effa012f80a5d583f271b99e82db24e288a5af82eae4fa423cf1
+  data.tar.gz: 9fe2b02c6f58355876c91d8954d3039a14b948f67b7a5730319579fb5d405a9f
 SHA512:
-  metadata.gz: 488afe1762be438b3d02ccc89a1616ce8a8600047dd9e7f5fdb988474d335d494a44a40fb3f1e4c24cb804dde777e6246adbc6b737eeab2317525cee4de90f33
-  data.tar.gz: 5af49960b8f13c6fdd2a6f3b7e961da14632820e2b323853f53af2be45f3655aa36b07224ae9734cbd4ca505bd136c8e1b5da6e115b9019031667ea9cd708c9b
+  metadata.gz: e00009c32acb5e684ee6c2dea9c7a7d4a40133f14ff8ec5929e39e97622b6daf8c5a027ad6cfdf9c3ace7e27f7accb9f1fff25f954e51eab11854ffb7f0f5e9b
+  data.tar.gz: 7b8f0c486ab5deaa118debcedc1bf43b6164832cde533d52cb99fe8ac44c76ffe9c555101331ed7cff4b7e421fa321898ff3cf195af80d3a4cda4ed2b5c19db9

data/.circleci/config.yml

@@ -10,6 +10,7 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
   ruby_26:
     docker:
       - image: circleci/ruby:2.6-node
@@ -19,6 +20,7 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
   ruby_27:
     docker:
       - image: circleci/ruby:2.7-node
@@ -28,6 +30,7 @@ executors:
           DATABASE_URL: 'sqlite3::memory:'
       - image: memcached
       - image: redis
+      - image: circleci/dynamodb
   ruby_25_mysql2:
     docker:
       - image: circleci/ruby:2.5-node
@@ -196,6 +199,7 @@ workflows:
                 - ruby_26
                 - ruby_25
               gemfile:
+                - "./gemfiles/aws_30.gemfile"
                 - "./gemfiles/cuba_30.gemfile"
                 - "./gemfiles/dalli_20.gemfile"
                 - "./gemfiles/excon_02.gemfile"

data/Appraisals

@@ -1,6 +1,10 @@
 # (c) Copyright IBM Corp. 2021
 # (c) Copyright Instana Inc. 2021
 
+appraise 'aws-30' do
+  gem 'aws-sdk-dynamodb', '~> 1.59'
+end
+
 appraise 'cuba-30' do
   gem 'cuba', '>= 3.0', '< 4.0'
 end

data/gemfiles/aws_30.gemfile

@@ -0,0 +1,18 @@
+# This file was generated by Appraisal
+
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "minitest", "5.9.1"
+gem "minitest-reporters"
+gem "webmock"
+gem "puma"
+gem "rubocop", "~> 1.9"
+gem "rack-test"
+gem "simplecov", "~> 0.21.2"
+gem "aws-sdk-dynamodb", "~> 1.59"
+
+gemspec path: "../"

data/lib/instana/activators/aws_sdk_dynamodb.rb

@@ -0,0 +1,20 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Activators
+    class AwsDynamoDB < Activator
+      def can_instrument?
+        defined?(Aws::DynamoDB::Client)
+      end
+
+      def instrument
+        require 'instana/instrumentation/aws_sdk_dynamodb'
+
+        ::Aws::DynamoDB::Client.add_plugin(Instana::Instrumentation::DynamoDB)
+
+        true
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/aws_sdk_dynamodb.rb

@@ -0,0 +1,29 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+module Instana
+  module Instrumentation
+    class DynamoDB < Seahorse::Client::Plugin
+      class Handler < Seahorse::Client::Handler
+        def call(context)
+          dynamo_tags = {
+            op: context.operation_name,
+            table: table_name_from(context)
+          }
+
+          ::Instana.tracer.trace(:dynamodb, dynamo_tags) { @handler.call(context) }
+        end
+
+        private
+
+        def table_name_from(context)
+          context.params[:table_name] || context.params[:global_table_name] || 'Unknown'
+        end
+      end
+
+      def add_handlers(handlers, _config)
+        handlers.add(Handler, step: :initialize)
+      end
+    end
+  end
+end

data/lib/instana/instrumentation/excon.rb

@@ -5,7 +5,7 @@ module Instana
   module Instrumentation
     class Excon < ::Excon::Middleware::Base
       def request_call(datum)
-        return @stack.request_call(datum) unless ::Instana.tracer.tracing?
+        return @stack.request_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
 
         payload = { :http => {} }
         path = datum[:path].split('?').first
@@ -30,7 +30,7 @@ module Instana
       end
 
       def error_call(datum)
-        return @stack.error_call(datum) unless ::Instana.tracer.tracing?
+        return @stack.error_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
 
         if datum[:pipeline] == true
           ::Instana.tracer.log_async_error(datum[:error], datum[:instana_span])
@@ -43,7 +43,7 @@ module Instana
       def response_call(datum)
         # FIXME: Will connect exceptions call a response?
         #
-        return @stack.response_call(datum) unless ::Instana.tracer.tracing?
+        return @stack.response_call(datum) unless ::Instana.tracer.tracing? || !Instana.tracer.current_span.exit_span?
 
         result =  @stack.response_call(datum)
 

data/lib/instana/instrumentation/net-http.rb

@@ -7,7 +7,7 @@ module Instana
   module Instrumentation
     module NetHTTPInstrumentation
       def request(*args, &block)
-        if !Instana.tracer.tracing? || !started?
+        if !Instana.tracer.tracing? || Instana.tracer.current_span.exit_span? || !started?
           do_skip = true
           return super(*args, &block)
         end

data/lib/instana/instrumentation/sidekiq-client.rb

@@ -7,7 +7,7 @@ module Instana
       def call(worker_class, msg, queue, _redis_pool)
         kv_payload = { :'sidekiq-client' => {} }
         kv_payload[:'sidekiq-client'][:queue] = queue
-        kv_payload[:'sidekiq-client'][:job] = worker_class
+        kv_payload[:'sidekiq-client'][:job] = worker_class.to_s
         kv_payload[:'sidekiq-client'][:retry] = msg['retry'].to_s
         ::Instana.tracer.log_entry(:'sidekiq-client', kv_payload)
 

data/lib/instana/instrumentation/sidekiq-worker.rb

@@ -8,7 +8,7 @@ module Instana
         kv_payload = { :'sidekiq-worker' => {} }
         kv_payload[:'sidekiq-worker'][:job_id] = msg['jid']
         kv_payload[:'sidekiq-worker'][:queue] = msg['queue']
-        kv_payload[:'sidekiq-worker'][:job] = msg['class']
+        kv_payload[:'sidekiq-worker'][:job] = msg['class'].to_s
         kv_payload[:'sidekiq-worker'][:retry] = msg['retry'].to_s
 
         # Temporary until we move connection collection to redis

data/lib/instana/tracing/span.rb

@@ -6,10 +6,10 @@ module Instana
     REGISTERED_SPANS = [ :actioncontroller, :actionview, :activerecord, :excon,
                          :memcache, :'net-http', :rack, :render, :'rpc-client',
                          :'rpc-server', :'sidekiq-client', :'sidekiq-worker',
-                         :redis, :'resque-client', :'resque-worker', :'graphql.server'  ].freeze
+                         :redis, :'resque-client', :'resque-worker', :'graphql.server', :dynamodb  ].freeze
     ENTRY_SPANS = [ :rack, :'resque-worker', :'rpc-server', :'sidekiq-worker', :'graphql.server' ].freeze
     EXIT_SPANS = [ :activerecord, :excon, :'net-http', :'resque-client',
-                   :'rpc-client', :'sidekiq-client', :redis ].freeze
+                   :'rpc-client', :'sidekiq-client', :redis, :dynamodb ].freeze
     HTTP_SPANS = [ :rack, :excon, :'net-http' ].freeze
 
     attr_accessor :parent
@@ -289,6 +289,12 @@ module Instana
       @data.inspect
     end
 
+    # Check to see if the current span indicates an exit from application
+    # code and into an external service
+    def exit_span?
+      EXIT_SPANS.include?(@data[:n])
+    end
+
     #############################################################
     # OpenTracing Compatibility Methods
     #############################################################

data/lib/instana/version.rb

@@ -2,6 +2,6 @@
 # (c) Copyright Instana Inc. 2016
 
 module Instana
-  VERSION = "1.193.5"
+  VERSION = "1.193.6"
   VERSION_FULL = "instana-#{VERSION}"
 end

data/test/instrumentation/aws_test.rb

@@ -0,0 +1,33 @@
+# (c) Copyright IBM Corp. 2021
+# (c) Copyright Instana Inc. 2021
+
+require 'test_helper'
+
+class AwsTest < Minitest::Test
+  def test_dynamo_db
+    dynamo = Aws::DynamoDB::Client.new(
+      region: "local",
+      access_key_id: "placeholder",
+      secret_access_key: "placeholder",
+      endpoint: "http://localhost:8000"
+    )
+
+    assert_raises Aws::DynamoDB::Errors::ResourceNotFoundException do
+      Instana::Tracer.start_or_continue_trace(:dynamo_test, {}) do
+        dynamo.get_item(
+          table_name: 'sample_table',
+          key: { s: 'sample_item' }
+        )
+      end
+    end
+
+    spans = ::Instana.processor.queued_spans
+    dynamo_span, entry_span, *rest = spans
+
+    assert rest.empty?
+    assert_equal entry_span[:s], dynamo_span[:p]
+    assert_equal :dynamodb, dynamo_span[:n]
+    assert_equal :get_item, dynamo_span[:data][:op]
+    assert_equal 'sample_table', dynamo_span[:data][:table]
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: instana
 version: !ruby/object:Gem::Version
-  version: 1.193.5
+  version: 1.193.6
 platform: ruby
 authors:
 - Peter Giacomo Lombardo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-02-12 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -172,6 +172,7 @@ files:
 - 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
@@ -202,6 +203,7 @@ 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/cuba.rb
 - lib/instana/activators/dalli.rb
 - lib/instana/activators/excon.rb
@@ -240,6 +242,7 @@ 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/dalli.rb
 - lib/instana/instrumentation/excon.rb
 - lib/instana/instrumentation/graphql.rb
@@ -276,6 +279,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
@@ -367,6 +371,7 @@ test_files:
 - 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