epsagon 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd8b447f6b5d8e9f1dc22ae3b5e11e05b5236e4c84acb54b940e2cbb04d4f2ac
-  data.tar.gz: 45822ce4a73671ac392e1f380b10a37b87fcf4ab2f292eb4e3255d289838a188
+  metadata.gz: a7b3206724c319044ec03107de40ed46798b935d85e6aba2a5cadadfe777e86c
+  data.tar.gz: cd515cf0bcd75faba2d3153f456c44441fa9df5e511f7a8b4aea5dc95178a3c1
 SHA512:
-  metadata.gz: 3c4bcf3d0d267bc843610351b8eb5788e5e99613fbc7f40b36acfdada628c73d5b3f524b69b5ceaa0fda047abbc9e0bc18bdccd0edfe59f3aa2b52f8650e9fc8
-  data.tar.gz: e4440cffd10b7a003dbbeac40b3521a8f9465ef0a3bc3d30df2e87c62d02067c09863e1bf0f49129172cd1a3f5291c83a489bdc91d79a6f6f9a8cd3a96a64574
+  metadata.gz: fa0bc9dcc5710f2498a9c39f3d86ebc43ed825b4fa23a8532457a6770ed9834de2ca2fab3e37c7324902ac38f0f426ea0de0ca2f1272a73c56ad35ff7afe1458
+  data.tar.gz: 00b78e433d7cfea98710f6f641123727a3b44edcfab51da0039363c1db135401166ea4d35f2d4e935f54d78de1434130ea33b092e83cd85d1ba56d3bead9e847

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
+date: 2021-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -106,6 +106,7 @@ extra_rdoc_files: []
 files:
 - lib/epsagon.rb
 - lib/instrumentation/aws_sdk.rb
+- lib/instrumentation/epsagon_faraday_middleware.rb
 - lib/instrumentation/faraday.rb
 - lib/instrumentation/net_http.rb
 - lib/instrumentation/sinatra.rb