epsagon 0.0.5 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71154f411911b4ef7b0c19e9b6b5a9c1bc490ac389ee928109d72375d87a2aff
-  data.tar.gz: e53b5278f2c8126888528f232e518e8b892b41fd7c026118c825bc19a222383f
+  metadata.gz: dcd34d0e419fb2fcbc2ffa3d2b7a90c5d7ca801934050d2a1dbce6c6060cdd1b
+  data.tar.gz: 0fdb70755b5db1bd8fc965fd47d1f8d8d0ac28d8e131ab7f768311d33c44ae71
 SHA512:
-  metadata.gz: f7ac4b83a72c9a32f4f79cc9c708360bb78eee46598369329a6ee917a759dd1624ef434b6da632500aa33dde01256bf304515fc39002c5be52c300e29ff6759d
-  data.tar.gz: 3f4d4c862049148a6714bf12be7c2b5437fc60d5a355b97f50f1f686d4a4585e2812ff9f906ce6d70305d049f8f1d701fb412ee205f9589b0e71ee16db1f7466
+  metadata.gz: b868ea0d2887c31e1781ebbe31c6a5f04fb2fdafa1ecfc897142555f2191b8f9b606d50a249a025fd141c8e606c521c0030e5f33de139825066fb925dce19619
+  data.tar.gz: 7c376ffa54f29a2186a0b9acf456250738d9d7ea8d1f6a26d673d40118d0210999c500ac58a326593cc32429461bae7e15b98a9856b8dd1cc6675490c9e04a25

data/lib/epsagon.rb

@@ -4,10 +4,12 @@ require 'rubygems'
 require 'net/http'
 require 'bundler/setup'
 require 'opentelemetry/sdk'
+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
@@ -38,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

data/lib/instrumentation/epsagon_faraday_middleware.rb

@@ -0,0 +1,74 @@
+
+require_relative '../util'
+require 'faraday'
+
+# Faraday middleware for epsagon instrumentaton
+class EpsagonFaradayMiddleware < ::Faraday::Middleware
+  def config
+    EpsagonFaradayInstrumentation.instance.config
+  end
+
+  HTTP_METHODS_SYMBOL_TO_STRING = {
+    connect: 'CONNECT',
+    delete: 'DELETE',
+    get: 'GET',
+    head: 'HEAD',
+    options: 'OPTIONS',
+    patch: 'PATCH',
+    post: 'POST',
+    put: 'PUT',
+    trace: 'TRACE'
+  }.freeze
+
+  def call(env)
+    http_method = HTTP_METHODS_SYMBOL_TO_STRING[env.method]
+    path, path_params = env.url.path.split(';')
+
+    attributes = {
+      'type' => 'http',
+      'operation' => http_method,
+      'http.scheme' => env.url.scheme,
+      'http.request.path' => path
+    }
+
+    unless config[:epsagon][:metadata_only]
+      attributes.merge!(Util.epsagon_query_attributes(env.url.query))
+      attributes.merge!({
+                          'http.request.path_params' => path_params,
+                          'http.request.headers' => env.request_headers.to_json,
+                          'http.request.body' => env.body,
+                          'http.request.headers.User-Agent' => env.request_headers['User-Agent']
+                        })
+    end
+
+    tracer.in_span(
+      env.url.host,
+      attributes: attributes,
+      kind: :client
+    ) do |span|
+      OpenTelemetry.propagation.http.inject(env.request_headers)
+
+      app.call(env).on_complete { |req| trace_response(span, req.response) }
+    end
+  end
+
+  private
+
+  attr_reader :app
+
+  def tracer
+    EpsagonFaradayInstrumentation.instance.tracer
+  end
+
+  def trace_response(span, response)
+    span.set_attribute('http.status_code', response.status)
+
+    unless config[:epsagon][:metadata_only]
+      span.set_attribute('http.response.headers', response.headers.to_json)
+      span.set_attribute('http.response.body', response.body)
+    end
+    span.status = OpenTelemetry::Trace::Status.http_to_status(
+      response.status
+    )
+  end
+end

data/lib/instrumentation/faraday.rb

@@ -1,79 +1,4 @@
 # frozen_string_literal: true
-
-require 'faraday'
-require_relative '../util'
-
-# Faraday middleware for epsagon instrumentaton
-class EpsagonFaradayMiddleware < ::Faraday::Middleware
-  def config
-    EpsagonFaradayInstrumentation.instance.config
-  end
-
-  HTTP_METHODS_SYMBOL_TO_STRING = {
-    connect: 'CONNECT',
-    delete: 'DELETE',
-    get: 'GET',
-    head: 'HEAD',
-    options: 'OPTIONS',
-    patch: 'PATCH',
-    post: 'POST',
-    put: 'PUT',
-    trace: 'TRACE'
-  }.freeze
-
-  def call(env)
-    http_method = HTTP_METHODS_SYMBOL_TO_STRING[env.method]
-    path, path_params = env.url.path.split(';')
-
-    attributes = {
-      'type' => 'http',
-      'operation' => http_method,
-      'http.scheme' => env.url.scheme,
-      'http.request.path' => path
-    }
-
-    unless config[:epsagon][:metadata_only]
-      attributes.merge!(Util.epsagon_query_attributes(env.url.query))
-      attributes.merge!({
-                          'http.request.path_params' => path_params,
-                          'http.request.headers' => env.request_headers.to_json,
-                          'http.request.body' => env.body,
-                          'http.request.headers.User-Agent' => env.request_headers['User-Agent']
-                        })
-    end
-
-    tracer.in_span(
-      env.url.host,
-      attributes: attributes,
-      kind: :client
-    ) do |span|
-      OpenTelemetry.propagation.http.inject(env.request_headers)
-
-      app.call(env).on_complete { |req| trace_response(span, req.response) }
-    end
-  end
-
-  private
-
-  attr_reader :app
-
-  def tracer
-    EpsagonFaradayInstrumentation.instance.tracer
-  end
-
-  def trace_response(span, response)
-    span.set_attribute('http.status_code', response.status)
-
-    unless config[:epsagon][:metadata_only]
-      span.set_attribute('http.response.headers', response.headers.to_json)
-      span.set_attribute('http.response.body', response.body)
-    end
-    span.status = OpenTelemetry::Trace::Status.http_to_status(
-      response.status
-    )
-  end
-end
-
 # Patch faraday to include middleware
 module EpsagonFaradayPatch
   def adapter(*args)
@@ -90,6 +15,7 @@ class EpsagonFaradayInstrumentation < OpenTelemetry::Instrumentation::Base
   VERSION = '0.0.0'
 
   install do |_config|
+    require_relative 'epsagon_faraday_middleware'
     ::Faraday::Middleware.register_middleware(
       epsagon_open_telemetry: EpsagonFaradayMiddleware
     )

data/lib/instrumentation/sinatra.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-require 'sinatra'
 require 'opentelemetry'
 
 require_relative '../util'

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.10
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-api
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-sdk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.1
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-sinatra
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-exporter-otlp
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.11.0
 description: 'Epsagon provides tracing to Ruby applications for the collection of
   distributed tracing and performance metrics to simplify complex architectures, eliminate
   manual work, visualize and correlate data to identify and fix problems fast.
@@ -21,8 +77,9 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/epsagon.rb
-- lib/epsagon_opentelemetry.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
 - lib/instrumentation/sinatra.rb

data/lib/epsagon_opentelemetry.rb

@@ -1,42 +0,0 @@
-# frozen_string_literal: true
-
-require 'rubygems'
-require 'net/http'
-require 'bundler/setup'
-require 'opentelemetry'
-
-require_relative 'instrumentation/sinatra'
-require_relative 'instrumentation/net_http'
-require_relative 'instrumentation/faraday'
-require_relative 'util'
-
-Bundler.require
-
-def metadata_only?
-  ENV['EPSAGON_METADATA']&.to_s&.downcase != 'false'
-end
-
-def debug?
-  ENV['EPSAGON_DEBUG']&.to_s&.downcase == 'true'
-end
-
-# #config opentelemetry with epsaon extensions:
-OpenTelemetry::SDK.configure do |c|
-  c.use 'EpsagonSinatraInstrumentation'
-  c.use 'EpsagonNetHTTPInstrumentation'
-  c.use 'EpsagonFaradayInstrumentation'
-  if debug?
-    c.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
-      OpenTelemetry::SDK::Trace::Export::ConsoleSpanExporter.new
-    )
-  else
-    c.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
-      EpsagonExporter.new(headers: {
-                            epasgon_token: ENV['EPSAGON_TOKEN'],
-                            epasgon_app_name: ENV['EPSAGON_APP_NAME']
-                          },
-                          endpoint: '7fybd5lgpc.execute-api.us-east-2.amazonaws.com:443/dev/trace',
-                          insecure: false)
-    )
-  end
-end