epsagon 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bbcd3ad1c94c24be608924993e0c0c6fc0455982b51f66a61e159fce8713e607
-  data.tar.gz: 005d41bf64026ec6918eeaa9d99a77ee8e108b8d1574391494604eb99dd76733
+  metadata.gz: dcd34d0e419fb2fcbc2ffa3d2b7a90c5d7ca801934050d2a1dbce6c6060cdd1b
+  data.tar.gz: 0fdb70755b5db1bd8fc965fd47d1f8d8d0ac28d8e131ab7f768311d33c44ae71
 SHA512:
-  metadata.gz: ad16af491cc509358edfc44dda23c838604a33beb6d6ad25d84b183bc0e0d4f4e12f9991a92fa91d54b10f2fb0dc2ebb33f4bf75244b54a0848bc3a584915d41
-  data.tar.gz: 143981531b488487e9bd13bcf58d412a02a1efcd53cdff9548a4157c49041eb5305796016d941fb5e0e3446e914106aca56b94303803b99fd96d85d01d586a27
+  metadata.gz: b868ea0d2887c31e1781ebbe31c6a5f04fb2fdafa1ecfc897142555f2191b8f9b606d50a249a025fd141c8e606c521c0030e5f33de139825066fb925dce19619
+  data.tar.gz: 7c376ffa54f29a2186a0b9acf456250738d9d7ea8d1f6a26d673d40118d0210999c500ac58a326593cc32429461bae7e15b98a9856b8dd1cc6675490c9e04a25

data/lib/epsagon.rb

@@ -9,6 +9,7 @@ require 'opentelemetry/exporter/otlp'
 require_relative 'instrumentation/sinatra'
 require_relative 'instrumentation/net_http'
 require_relative 'instrumentation/faraday'
+require_relative 'instrumentation/aws_sdk'
 require_relative 'util'
 
 Bundler.require
@@ -39,6 +40,7 @@ module Epsagon
     configurator.use 'EpsagonSinatraInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonNetHTTPInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonFaradayInstrumentation', { epsagon: @@epsagon_config }
+    configurator.use 'EpsagonAwsSdkInstrumentation', { epsagon: @@epsagon_config }
 
     if @@epsagon_config[:debug]
       configurator.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(

data/lib/instrumentation/aws_sdk.rb

@@ -2,32 +2,6 @@
 
 require_relative '../util'
 
-# AWS SDK plugin for epsagon instrumentation
-class EpsagonAwsPlugin < Seahorse::Client::Plugin
-  def add_handlers(handlers, _)
-    handlers.add(EpsagonAwsHandler, step: :validate)
-  end
-end
-
-# Generates Spans for all uses of AWS SDK
-class EpsagonAwsHandler < Seahorse::Client::Handler
-  def call(context)
-    tracer.in_span('') do |span|
-      @handler.call(context).tap do
-        span.set_attribute('aws.operation', context[:command])
-        span.set_attribute('aws.status_code', context[:status_code])
-        span.set_attribute('aws.service', context[:service_name])
-        span.set_attribute('aws.account_id', context[:account_id])
-        span.set_attribute('aws.status_code', context[:status_code])
-      end
-    end
-  end
-
-  def tracer
-    EpsagonAwsSdkInstrumentation.instance.tracer
-  end
-end
-
 # AWS SDK epsagon instrumentation
 class EpsagonAwsSdkInstrumentation < OpenTelemetry::Instrumentation::Base
   VERSION = '0.0.0'
@@ -143,6 +117,7 @@ class EpsagonAwsSdkInstrumentation < OpenTelemetry::Instrumentation::Base
   ].freeze
 
   install do |_|
+    require_relative 'aws_sdk_plugin'
     ::Seahorse::Client::Base.add_plugin(EpsagonAwsPlugin)
     loaded_constants.each { |klass| klass.add_plugin(EpsagonAwsPlugin) }
   end

data/lib/instrumentation/aws_sdk_plugin.rb

@@ -0,0 +1,26 @@
+require 'aws-sdk-core'
+
+# AWS SDK plugin for epsagon instrumentation
+class EpsagonAwsPlugin < Seahorse::Client::Plugin
+  def add_handlers(handlers, _)
+    handlers.add(EpsagonAwsHandler, step: :validate)
+  end
+end
+
+# Generates Spans for all uses of AWS SDK
+class EpsagonAwsHandler < Seahorse::Client::Handler
+  def call(context)
+    tracer.in_span('') do |span|
+      @handler.call(context).tap do
+        span.set_attribute('aws.service', context.client.class.to_s.split('::')[1].downcase)
+        span.set_attribute('aws.aws.operation', context.operation.name)
+        span.set_attribute('aws.region', context.client.config.region)
+        span.set_attribute('aws.status_code', context.http_response.status_code)
+      end
+    end
+  end
+
+  def tracer
+    EpsagonAwsSdkInstrumentation.instance.tracer
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -78,6 +78,7 @@ extra_rdoc_files: []
 files:
 - lib/epsagon.rb
 - lib/instrumentation/aws_sdk.rb
+- lib/instrumentation/aws_sdk_plugin.rb
 - lib/instrumentation/epsagon_faraday_middleware.rb
 - lib/instrumentation/faraday.rb
 - lib/instrumentation/net_http.rb