epsagon 0.0.16 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 808ee2781331d674be9e661fdb982402a9fa118a7e530226334dac758ce80dbb
-  data.tar.gz: 370aad1ea87d60e10ffa0b0c6777951c290aaacb2074a6556b6b77a41f9606d3
+  metadata.gz: 73d94ad48a8190e090468c50a16752fca266145da6dacaa9f050c7c9709f4a08
+  data.tar.gz: ce72f581f6e6c7cb1923685c86619750dad00d3c902477e76fd7fd0fce9ddaeb
 SHA512:
-  metadata.gz: 223f608c05ddf216c1db46709d234604af81dca746fe16d5c4f24e89618450313c6e8a972f35fa2c2f5c6aa4b5811cd97e638d625dde9a1d5b0bc9a00575cf92
-  data.tar.gz: 5317d3432c01890de86919a5415322ed151002d12058027fa890cffa34ee32818d3e87e1d4484b5317aa1ab7c9047bf9347c2d5cf71e5718791ac6766e0163eb
+  metadata.gz: e1fcdc94c369e2dad0f40c6e50c788a7fde75f9f61f8188769fb24b6ca67b3dadc8519e2964720758129ffcd462fb1a573afa9e192503d72a2532b614f537fde
+  data.tar.gz: 7fa7173eb476645bf4b3b116719bf9cdca8f84f63e301e82ff7925ea3240438ddb8ca00b6e84074a4540e5694518269d71bf5e243f47cfa50c1a9aab438f0365

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.22'
+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/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.16
+  version: 0.0.22
 platform: ruby
 authors:
 - Epsagon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-19 00:00:00.000000000 Z
+date: 2021-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opentelemetry-api
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.11.0
+- !ruby/object:Gem::Dependency
+  name: opentelemetry-instrumentation-sidekiq
+  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
@@ -77,6 +91,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