epsagon 0.0.4 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8562e3fae0593320be07b191b3c23951bbdb6ee6483a766edfe44459c9e52d67
-  data.tar.gz: 20b587b39248f027a56540b4ca438297025330f6b7587939a8332a362d823af3
+  metadata.gz: bbcd3ad1c94c24be608924993e0c0c6fc0455982b51f66a61e159fce8713e607
+  data.tar.gz: 005d41bf64026ec6918eeaa9d99a77ee8e108b8d1574391494604eb99dd76733
 SHA512:
-  metadata.gz: 324f5a094aef1e98a4786978c3320763d9a3bab63d49967d3c3ac274141e729bb1fdf7293d3c8b7bb3785dff6a0bf29b2ccaaa25fcb4229106c0b514666d1851
-  data.tar.gz: 51df59c2af4f2f8811d7cd57738aef836f35f05069cbca9f728a05b8dbd615fab80fce91d3f608da16265f50332ea86211c535f8e6a63c38f5d79337b7decc39
+  metadata.gz: ad16af491cc509358edfc44dda23c838604a33beb6d6ad25d84b183bc0e0d4f4e12f9991a92fa91d54b10f2fb0dc2ebb33f4bf75244b54a0848bc3a584915d41
+  data.tar.gz: 143981531b488487e9bd13bcf58d412a02a1efcd53cdff9548a4157c49041eb5305796016d941fb5e0e3446e914106aca56b94303803b99fd96d85d01d586a27

data/lib/epsagon.rb

@@ -3,8 +3,8 @@
 require 'rubygems'
 require 'net/http'
 require 'bundler/setup'
-require 'opentelemetry-sdk'
-require 'opentelemetry-api'
+require 'opentelemetry/sdk'
+require 'opentelemetry/exporter/otlp'
 
 require_relative 'instrumentation/sinatra'
 require_relative 'instrumentation/net_http'

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.4
+  version: 0.0.9
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-06 00:00:00.000000000 Z
-dependencies: []
+date: 2021-04-10 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,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/epsagon.rb
-- lib/epsagon_opentelemetry.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

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