epsagon 0.0.13 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 61ba7bcc54462d42f93ab3ef042ad54eae55b0447849ed2cb04407980d95ac5c
-  data.tar.gz: cbe32e9ece025429fba57e0468b9016e81ab0d291a20755b3fe4c7eb13bcfb13
+  metadata.gz: d65d072dcdd60a8e031bd72b9c3a259d499d1e6494171ad9e24d1acf49cd2044
+  data.tar.gz: ad627edaee775675bfd4589e0e8a221f7555a62fd5192d3a3de3926f293d1ede
 SHA512:
-  metadata.gz: d722c6363b5a2184034a8e05e43b7fc5ad20f1f4689b62f44f0287b6bfef62253765d1d71f312f49bf4d5d9698b82ba3e6507b45260b53cff3fe637f736b501f
-  data.tar.gz: a6d24b5d4d8de7e42e8780d936e22256c0d23618c19c7c232ea0d96c3ecbf95eed7f7e43d6bba044ded25fda965903262328f77893155718e4df8a23ddd146d8
+  metadata.gz: 1b5209a05093c2822a4da0673f304cd3074c58acc77f057891f34aa2953d4d64685f1069ae2d4136d123a5d792b11cad2edd29edfd404e0867b618acee5dbbf5
+  data.tar.gz: 893fe3823c6335e27efd66dce62ea2d4ffbd80d48bfd2041c4b453506686daa9415a28245a336a3f2d9b1b533f9da228e509d41e369fd58c5795192abcaefec7

data/lib/epsagon.rb

@@ -12,11 +12,13 @@ require_relative 'instrumentation/faraday'
 require_relative 'instrumentation/aws_sdk'
 require_relative 'instrumentation/rails'
 require_relative 'util'
+require_relative 'epsagon_constants'
 
 Bundler.require
 
 # Epsagon tracing main entry point
 module Epsagon
+  
   DEFAULT_BACKEND = 'opentelemetry.tc.epsagon.com:443/traces'
 
   @@epsagon_config = {
@@ -24,6 +26,7 @@ module Epsagon
     debug: ENV['EPSAGON_DEBUG']&.to_s&.downcase == 'true',
     token: ENV['EPSAGON_TOKEN'],
     app_name: ENV['EPSAGON_APP_NAME'],
+    max_attribute_size: ENV['EPSAGON_MAX_ATTRIBUTE_SIZE'] || 5000,
     backend: ENV['EPSAGON_BACKEND'] || DEFAULT_BACKEND
   }
 
@@ -34,17 +37,26 @@ module Epsagon
     OpenTelemetry::SDK.configure
   end
 
+  def get_config
+    @@epsagon_config
+  end
+
   # config opentelemetry with epsaon extensions:
 
   def epsagon_confs(configurator)
     configurator.resource = OpenTelemetry::SDK::Resources::Resource.telemetry_sdk.merge(
-      OpenTelemetry::SDK::Resources::Resource.create({ 'application' => @@epsagon_config[:app_name] })
+      OpenTelemetry::SDK::Resources::Resource.create({ 
+        'application' => @@epsagon_config[:app_name],
+        'epsagon.version' => EpsagonConstants::VERSION
+      })
     )
     configurator.use 'EpsagonSinatraInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonNetHTTPInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonFaradayInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonAwsSdkInstrumentation', { epsagon: @@epsagon_config }
     configurator.use 'EpsagonRailsInstrumentation', { epsagon: @@epsagon_config }
+    configurator.use 'OpenTelemetry::Instrumentation::Sidekiq'
+
 
     if @@epsagon_config[:debug]
       configurator.add_span_processor OpenTelemetry::SDK::Trace::Export::SimpleSpanProcessor.new(
@@ -70,6 +82,29 @@ module Epsagon
   end
 end
 
+
+module SpanExtension
+
+  BLANKS = [nil, [], '']
+
+  def set_attribute(key, value)
+    unless BLANKS.include?(value)
+      value = Util.trim_attr(value, Epsagon.get_config[:max_attribute_size])
+      super(key, value)
+    end
+  end
+
+  def initialize(*args)
+    super(*args)
+    if @attributes
+      @attributes = Hash[@attributes.map { |k,v|
+        [k, Util.trim_attr(v, Epsagon.get_config[:max_attribute_size])]
+      }]
+    end
+    
+  end
+end
+
 # monkey patch to include epsagon confs
 module OpenTelemetry
   # monkey patch inner SDK module
@@ -80,5 +115,11 @@ module OpenTelemetry
         Epsagon.epsagon_confs c
       end
     end
+
+    module Trace
+      class Span
+        prepend SpanExtension
+      end
+    end
   end
 end

data/lib/epsagon_constants.rb

@@ -0,0 +1,3 @@
+module EpsagonConstants
+	VERSION = '0.0.17'
+end

data/lib/instrumentation/aws_sdk.rb

@@ -1,10 +1,11 @@
 # frozen_string_literal: true
 
 require_relative '../util'
+require_relative '../epsagon_constants'
 
 # AWS SDK epsagon instrumentation
 class EpsagonAwsSdkInstrumentation < OpenTelemetry::Instrumentation::Base
-  VERSION = '0.0.0'
+  VERSION = EpsagonConstants::VERSION
   SERVICES = %w[
     ACM
     APIGateway

data/lib/instrumentation/aws_sdk_plugin.rb

@@ -31,6 +31,6 @@ class EpsagonAwsHandler < Seahorse::Client::Handler
   end
 
   def tracer
-    EpsagonAwsSdkInstrumentation.instance.tracer
+    EpsagonAwsSdkInstrumentation.instance.tracer()
   end
 end

data/lib/instrumentation/epsagon_faraday_middleware.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative '../util'
+require_relative '../epsagon_constants'
+
 require 'faraday'
 
 # Faraday middleware for epsagon instrumentaton

data/lib/instrumentation/epsagon_rails_middleware.rb

@@ -85,7 +85,11 @@ class EpsagonRackMiddleware
                      attributes: request_span_attributes(env: env),
                      kind: :server) do |http_span|
         RackExtension.with_span(http_span) do
-          tracer.in_span('rails') do |framework_span|
+          tracer.in_span(
+              env['HTTP_HOST'],
+              kind: :server,
+              attributes: {type: 'rails'}
+            ) do |framework_span|
             @app.call(env).tap do |status, headers, response|
               set_attributes_after_request(http_span, framework_span, status, headers, response)
             end
@@ -135,7 +139,7 @@ class EpsagonRackMiddleware
     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
     }

data/lib/instrumentation/faraday.rb

@@ -13,7 +13,7 @@ end
 
 # Faraday epsagon instrumentaton
 class EpsagonFaradayInstrumentation < OpenTelemetry::Instrumentation::Base
-  VERSION = '0.0.0'
+  VERSION = EpsagonConstants::VERSION
 
   install do |_config|
     require_relative 'epsagon_faraday_middleware'

data/lib/instrumentation/net_http.rb

@@ -3,6 +3,7 @@
 require 'opentelemetry'
 
 require_relative '../util'
+require_relative '../epsagon_constants'
 
 # Net::HTTP patch for epsagon instrumentaton
 module EpsagonNetHTTPExtension
@@ -74,7 +75,7 @@ end
 
 # Net::HTTP epsagon instrumentaton
 class EpsagonNetHTTPInstrumentation < OpenTelemetry::Instrumentation::Base
-  VERSION = '0.0.0'
+  VERSION = EpsagonConstants::VERSION
 
   install do |_|
     ::Net::HTTP.prepend(EpsagonNetHTTPExtension)

data/lib/instrumentation/rails.rb

@@ -5,6 +5,8 @@ require 'rails'
 require 'action_controller/railtie'
 
 require_relative '../util'
+require_relative '../epsagon_constants'
+
 
 module RackExtension
   module_function

data/lib/instrumentation/sinatra.rb

@@ -3,6 +3,7 @@
 require 'opentelemetry'
 
 require_relative '../util'
+require_relative '../epsagon_constants'
 
 # Sinatra middleware for epsagon instrumentation
 class EpsagonTracerMiddleware
@@ -111,7 +112,7 @@ end
 
 # Sinatra epsagon instrumentation
 class EpsagonSinatraInstrumentation < OpenTelemetry::Instrumentation::Base
-  VERSION = '0.0.0'
+  VERSION = EpsagonConstants::VERSION
 
   install do |_|
     ::Sinatra::Base.register EpsagonTracerExtension

data/lib/util.rb

@@ -11,4 +11,23 @@ module Util
       { 'http.request.query' => query_string }
     end
   end
+
+  def self.trim_attr(value, max_size)
+  	if value.instance_of? Array then 
+  		current_size = 2
+  		value.each_with_index do |el, i|
+  			el_size =  el.to_s.size + (i==0 ? 0 : 2)
+  			if current_size + el_size > max_size then 
+  				return value[0,i] + [Util.trim_attr(el, max_size - current_size)]
+  			else 
+  				current_size += el_size
+  			end
+  		end
+  		return value
+  	elsif value.instance_of? String then
+  		value[0, max_size]
+  	else
+  		value
+  	end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: epsagon
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.18
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -77,6 +77,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/epsagon.rb
+- lib/epsagon_constants.rb
 - lib/instrumentation/aws_sdk.rb
 - lib/instrumentation/aws_sdk_plugin.rb
 - lib/instrumentation/epsagon_faraday_middleware.rb
@@ -85,6 +86,7 @@ files:
 - lib/instrumentation/net_http.rb
 - lib/instrumentation/rails.rb
 - lib/instrumentation/sinatra.rb
+- lib/instrumentation/version.rb
 - lib/util.rb
 homepage: https://github.com/epsagon/epsagon-ruby
 licenses: