epsagon 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfe4b588a7d3aeac7ea954338f6814c1b733cdacaab175b8ab63711a09adb849
-  data.tar.gz: a18b237f3e75ff45e3866a4570ad4125951480366007f0700af412254e04fd5e
+  metadata.gz: 61ba7bcc54462d42f93ab3ef042ad54eae55b0447849ed2cb04407980d95ac5c
+  data.tar.gz: cbe32e9ece025429fba57e0468b9016e81ab0d291a20755b3fe4c7eb13bcfb13
 SHA512:
-  metadata.gz: 4b0e7b5e44f8941fe647e69cb4f59c86ce144eef01fe7c96a035652c8fede98d2b781d59f495a852e1c0919fa5af40fe6413e2ef2c6c2b9c3b4a013b5ebef5c0
-  data.tar.gz: d67ce25f32683d501729e1715e6427881f7a89fc730030ade43ca3df05402c8277237df9fb1f38c9a4e460f21863a076903c2c8f011b715b50b56d4be3e2b549
+  metadata.gz: d722c6363b5a2184034a8e05e43b7fc5ad20f1f4689b62f44f0287b6bfef62253765d1d71f312f49bf4d5d9698b82ba3e6507b45260b53cff3fe637f736b501f
+  data.tar.gz: a6d24b5d4d8de7e42e8780d936e22256c0d23618c19c7c232ea0d96c3ecbf95eed7f7e43d6bba044ded25fda965903262328f77893155718e4df8a23ddd146d8

data/lib/epsagon.rb

@@ -17,13 +17,15 @@ Bundler.require
 
 # Epsagon tracing main entry point
 module Epsagon
+  DEFAULT_BACKEND = 'opentelemetry.tc.epsagon.com:443/traces'
+
   @@epsagon_config = {
-      metadata_only: ENV['EPSAGON_METADATA']&.to_s&.downcase != 'false',
-      debug: ENV['EPSAGON_DEBUG']&.to_s&.downcase == 'true',
-      token: ENV['EPSAGON_TOKEN'],
-      app_name: ENV['EPSAGON_APP_NAME'],
-      backend: ENV['EPSAGON_BACKEND'] || 'localhost:55681/v1/trace'
-    }
+    metadata_only: ENV['EPSAGON_METADATA']&.to_s&.downcase != 'false',
+    debug: ENV['EPSAGON_DEBUG']&.to_s&.downcase == 'true',
+    token: ENV['EPSAGON_TOKEN'],
+    app_name: ENV['EPSAGON_APP_NAME'],
+    backend: ENV['EPSAGON_BACKEND'] || DEFAULT_BACKEND
+  }
 
   module_function
 
@@ -47,10 +49,10 @@ module Epsagon
     if @@epsagon_config[:debug]
       configurator.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
         OpenTelemetry::Exporter::OTLP::Exporter.new(headers: {
-                            'x-epsagon-token' => @@epsagon_config[:token]
-                          },
-                          endpoint: @@epsagon_config[:backend],
-                          insecure: @@epsagon_config[:insecure] || false)
+                                                      'x-epsagon-token' => @@epsagon_config[:token]
+                                                    },
+                                                    endpoint: @@epsagon_config[:backend],
+                                                    insecure: @@epsagon_config[:insecure] || false)
       )
 
       configurator.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
@@ -66,7 +68,6 @@ module Epsagon
       )
     end
   end
-
 end
 
 # monkey patch to include epsagon confs

data/lib/instrumentation/aws_sdk_plugin.rb

@@ -1,10 +1,13 @@
+# frozen_string_literal: true
+
 require 'aws-sdk-core'
 require 'opentelemetry/common'
 require 'opentelemetry/sdk'
 
-def untraced
-  OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new) { yield }
+def untraced(&block)
+  OpenTelemetry::Trace.with_span(OpenTelemetry::Trace::Span.new, &block)
 end
+
 # AWS SDK plugin for epsagon instrumentation
 class EpsagonAwsPlugin < Seahorse::Client::Plugin
   def add_handlers(handlers, _)
@@ -15,13 +18,13 @@ end
 # Generates Spans for all uses of AWS SDK
 class EpsagonAwsHandler < Seahorse::Client::Handler
   def call(context)
-    tracer.in_span('') do |span|
+    tracer.in_span('', kind: :client) 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.operation', context.operation.name)
           span.set_attribute('aws.region', context.client.config.region)
-          span.set_attribute('aws.status_code', context.http_response.status_code)
+          span.set_attribute('http.status_code', context.http_response.status_code)
         end
       end
     end
@@ -30,4 +33,4 @@ class EpsagonAwsHandler < Seahorse::Client::Handler
   def tracer
     EpsagonAwsSdkInstrumentation.instance.tracer
   end
-end
+end

data/lib/instrumentation/epsagon_faraday_middleware.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 
 require_relative '../util'
 require 'faraday'

data/lib/instrumentation/epsagon_rails_middleware.rb

@@ -1,41 +1,42 @@
-require 'opentelemetry/trace/status'
+# frozen_string_literal: true
 
+require 'opentelemetry/trace/status'
 
 module QueueTime
-	REQUEST_START = 'HTTP_X_REQUEST_START'
-	QUEUE_START = 'HTTP_X_QUEUE_START'
-	MINIMUM_ACCEPTABLE_TIME_VALUE = 1_000_000_000
-
-	module_function
-
-	def get_request_start(env, now = nil) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
-	  header = env[REQUEST_START] || env[QUEUE_START]
-	  return unless header
-
-	  # nginx header is seconds in the format "t=1512379167.574"
-	  # apache header is microseconds in the format "t=1570633834463123"
-	  # heroku header is milliseconds in the format "1570634024294"
-	  time_string = header.to_s.delete('^0-9')
-	  return if time_string.nil?
-
-	  # Return nil if the time is clearly invalid
-	  time_value = "#{time_string[0, 10]}.#{time_string[10, 6]}".to_f
-	  return if time_value.zero? || time_value < MINIMUM_ACCEPTABLE_TIME_VALUE
-
-	  # return the request_start only if it's lesser than
-	  # current time, to avoid significant clock skew
-	  request_start = Time.at(time_value)
-	  now ||= Time.now.utc
-	  request_start.utc > now ? nil : request_start
-	rescue StandardError => e
-	  # in case of an Exception we don't create a
-	  # `request.queuing` span
-	  OpenTelemetry.logger.debug("[rack] unable to parse request queue headers: #{e}")
-	  nil
-	end
+  REQUEST_START = 'HTTP_X_REQUEST_START'
+  QUEUE_START = 'HTTP_X_QUEUE_START'
+  MINIMUM_ACCEPTABLE_TIME_VALUE = 1_000_000_000
+
+  module_function
+
+  def get_request_start(env, now = nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
+    header = env[REQUEST_START] || env[QUEUE_START]
+    return unless header
+
+    # nginx header is seconds in the format "t=1512379167.574"
+    # apache header is microseconds in the format "t=1570633834463123"
+    # heroku header is milliseconds in the format "1570634024294"
+    time_string = header.to_s.delete('^0-9')
+    return if time_string.nil?
+
+    # Return nil if the time is clearly invalid
+    time_value = "#{time_string[0, 10]}.#{time_string[10, 6]}".to_f
+    return if time_value.zero? || time_value < MINIMUM_ACCEPTABLE_TIME_VALUE
+
+    # return the request_start only if it's lesser than
+    # current time, to avoid significant clock skew
+    request_start = Time.at(time_value)
+    now ||= Time.now.utc
+    request_start.utc > now ? nil : request_start
+  rescue StandardError => e
+    # in case of an Exception we don't create a
+    # `request.queuing` span
+    OpenTelemetry.logger.debug("[rack] unable to parse request queue headers: #{e}")
+    nil
+  end
 end
 
-class EpsagonRackMiddleware # rubocop:disable Metrics/ClassLength
+class EpsagonRackMiddleware
   class << self
     def allowed_rack_request_headers
       @allowed_rack_request_headers ||= Array(config[:allowed_request_headers]).each_with_object({}) do |header, memo|
@@ -72,7 +73,7 @@ class EpsagonRackMiddleware # rubocop:disable Metrics/ClassLength
     @app = app
   end
 
-  def call(env) # rubocop:disable Metrics/AbcSize
+  def call(env)
     original_env = env.dup
     extracted_context = OpenTelemetry.propagation.http.extract(env)
     frontend_context = create_frontend_span(env, extracted_context)
@@ -181,7 +182,7 @@ class EpsagonRackMiddleware # rubocop:disable Metrics/ClassLength
     end
   end
 
-  def set_attributes_after_request(http_span, framework_span, status, headers, response)
+  def set_attributes_after_request(http_span, _framework_span, status, headers, response)
     unless config[:epsagon][:metadata_only]
       http_span.set_attribute('http.response.headers', JSON.generate(headers))
       http_span.set_attribute('http.response.body', response.join)
@@ -269,7 +270,6 @@ end
 #   end
 # end
 
-
 class EpsagonRailtie < ::Rails::Railtie
   config.before_initialize do |app|
     # EpsagonRackInstrumentation.instance.install({})

data/lib/instrumentation/faraday.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Patch faraday to include middleware
 module EpsagonFaradayPatch
   def adapter(*args)

data/lib/instrumentation/net_http.rb

@@ -40,7 +40,7 @@ module EpsagonNetHTTPExtension
     tracer.in_span(
       @address,
       attributes: attributes,
-      kind: :Client
+      kind: :client
     ) do |span|
       OpenTelemetry.propagation.http.inject(req)
 

data/lib/instrumentation/rails.rb

@@ -1,12 +1,13 @@
-  
+# frozen_string_literal: true
+
 require 'opentelemetry'
 require 'rails'
-require "action_controller/railtie"
+require 'action_controller/railtie'
 
 require_relative '../util'
 
 module RackExtension
-  extend self
+  module_function
 
   CURRENT_SPAN_KEY = OpenTelemetry::Context.create_key('current-span')
 
@@ -41,7 +42,7 @@ module RackExtension
     OpenTelemetry::Context.with_value(CURRENT_SPAN_KEY, span) { |c, s| yield s, c }
   end
 end
-  
+
 module MetalPatch
   def dispatch(name, request, response)
     rack_span = RackExtension.current_span
@@ -50,15 +51,13 @@ module MetalPatch
   end
 end
 
-
-
 class EpsagonRailsInstrumentation < OpenTelemetry::Instrumentation::Base
-    install do |_config|
-      require_relative 'epsagon_rails_middleware'
-      ::ActionController::Metal.prepend(MetalPatch)
-    end
+  install do |_config|
+    require_relative 'epsagon_rails_middleware'
+    ::ActionController::Metal.prepend(MetalPatch)
+  end
 
-    present do
-      defined?(::Rails)
-    end
-end
+  present do
+    defined?(::Rails)
+  end
+end

data/lib/instrumentation/sinatra.rb

@@ -26,7 +26,7 @@ class EpsagonTracerMiddleware
     attributes = {
       'operation' => env['REQUEST_METHOD'],
       'type' => 'http',
-      'http.scheme' => env['PATH_INFO'],
+      'http.scheme' => env['rack.url_scheme'],
       'http.request.path' => path,
       'http.request.headers' => request_headers
     }
@@ -51,7 +51,11 @@ class EpsagonTracerMiddleware
       kind: :server,
       with_parent: parent_context(env)
     ) do |http_span|
-      tracer.in_span('sinatra') do |framework_span|
+      tracer.in_span(
+        env['HTTP_HOST'],
+        kind: :server,
+        attributes: { type: 'sinatra' }
+      ) do |framework_span|
         app.call(env).tap { |resp| trace_response(http_span, framework_span, env, resp) }
       end
     end
@@ -78,7 +82,7 @@ class EpsagonTracerMiddleware
     end
 
     http_span.set_attribute('http.status_code', status)
-    framework_span.set_attribute('http.route', env['sinatra.route'].split.last) if env['sinatra.route']
+    http_span.set_attribute('http.route', env['sinatra.route'].split.last) if env['sinatra.route']
     http_span.status = OpenTelemetry::Trace::Status.http_to_status(status)
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-13 00:00:00.000000000 Z
+date: 2021-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -25,19 +25,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-sdk
+  name: opentelemetry-exporter-otlp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.1
+        version: 0.11.0
 - !ruby/object:Gem::Dependency
   name: opentelemetry-instrumentation-sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -53,19 +53,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.11.0
 - !ruby/object:Gem::Dependency
-  name: opentelemetry-exporter-otlp
+  name: opentelemetry-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.0
+        version: 0.11.1
 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.