epsagon 0.0.6 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4bed616ed52fa572f7574732c18cdc87a34a6a223f969e3a0bdf95b7a132e77
-  data.tar.gz: b502868b35380f9187fbf2a452036060ac61ccabfae509ba4cfb66ed221a7365
+  metadata.gz: ab0dc77590ae9d619fa9dc901ce8af447cfa4555b3e4e2de648952add1604043
+  data.tar.gz: ba0e5a0589ac967734b3019e229031a345577cc44518d876228238011f3bd2a4
 SHA512:
-  metadata.gz: 0e4ab80eab789716260eea7824800b1e6c0f193114e72b45da826f36bdefedb59cc4e01147dbe4e8bb5824d10e2c525ed085d6bf256387746967009b13e7425a
-  data.tar.gz: cf2f072e8b3688c6988664304b06cad165fe43314aa862dae5ea4ef0ccb0a303f9b48dff56ff2913a5e86377f0186c23b13d7966bf3239c609606ab669e3fee3
+  metadata.gz: d383f183f674c601ef695e5b47adcaa770e8d9d6cfbe22d922b4e8785dc2b6f5c677ec0abfaab7c01df880afabe8b3c0395ffc076ff67fe3393ecc06f8a37cd5
+  data.tar.gz: 895b8b35143b0c232e4e3611ddf32652163a191f4d58af3283101af3f2f107f396be765931c3734f5f3aebe6cf2ec4f2d19d561b4cc033286cc1a33b4f373fd2

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,33 @@
+require 'aws-sdk-core'
+require 'opentelemetry/common'
+require 'opentelemetry/sdk'
+
+def untraced
+  OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new) { yield }
+end
+# 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|
+      untraced do
+        @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
+  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'
@@ -49,7 +48,7 @@ class EpsagonTracerMiddleware
     tracer.in_span(
       env['HTTP_HOST'],
       attributes: attributes,
-      kind: :Server,
+      kind: :server,
       with_parent: parent_context(env)
     ) do |http_span|
       tracer.in_span('sinatra') do |framework_span|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.11
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.1
-- !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
-- !ruby/object:Gem::Dependency
-  name: faraday
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.3'
 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.
@@ -105,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