sentry-ruby 0.1.2 → 4.0.1

data/lib/sentry/transaction.rb

@@ -0,0 +1,113 @@
+module Sentry
+  class Transaction < Span
+    SENTRY_TRACE_REGEXP = Regexp.new(
+      "^[ \t]*" +  # whitespace
+      "([0-9a-f]{32})?" +  # trace_id
+      "-?([0-9a-f]{16})?" +  # span_id
+      "-?([01])?" +  # sampled
+      "[ \t]*$"  # whitespace
+    )
+    UNLABELD_NAME = "<unlabeled transaction>".freeze
+    MESSAGE_PREFIX = "[Tracing]"
+
+    attr_reader :name, :parent_sampled
+
+    def initialize(name: nil, parent_sampled: nil, **options)
+      super(**options)
+
+      @name = name
+      @parent_sampled = parent_sampled
+      set_span_recorder
+    end
+
+    def self.from_sentry_trace(sentry_trace, **options)
+      return unless sentry_trace
+
+      match = SENTRY_TRACE_REGEXP.match(sentry_trace)
+      trace_id, parent_span_id, sampled_flag = match[1..3]
+
+      sampled = sampled_flag != "0"
+
+      new(trace_id: trace_id, parent_span_id: parent_span_id, parent_sampled: sampled, **options)
+    end
+
+    def to_hash
+      hash = super
+      hash.merge!(name: @name, sampled: @sampled, parent_sampled: @parent_sampled)
+      hash
+    end
+
+    def set_initial_sample_desicion(sampling_context = {})
+      unless Sentry.configuration.tracing_enabled?
+        @sampled = false
+        return
+      end
+
+      return unless @sampled.nil?
+
+      transaction_description = generate_transaction_description
+
+      logger = Sentry.configuration.logger
+      sample_rate = Sentry.configuration.traces_sample_rate
+      traces_sampler = Sentry.configuration.traces_sampler
+
+      if traces_sampler.is_a?(Proc)
+        sampling_context = sampling_context.merge(
+          parent_sampled: @parent_sampled,
+          transaction_context: self.to_hash
+        )
+
+        sample_rate = traces_sampler.call(sampling_context)
+      end
+
+      unless [true, false].include?(sample_rate) || (sample_rate.is_a?(Float) && sample_rate >= 0.0 && sample_rate <= 1.0)
+        @sampled = false
+        logger.warn("#{MESSAGE_PREFIX} Discarding #{transaction_description} because of invalid sample_rate: #{sample_rate}")
+        return
+      end
+
+      if sample_rate == 0.0 || sample_rate == false
+        @sampled = false
+        logger.debug("#{MESSAGE_PREFIX} Discarding #{transaction_description} because traces_sampler returned 0 or false")
+        return
+      end
+
+      if sample_rate == true
+        @sampled = true
+      else
+        @sampled = Random.rand < sample_rate
+      end
+
+      if @sampled
+        logger.debug("#{MESSAGE_PREFIX} Starting #{transaction_description}")
+      else
+        logger.debug(
+          "#{MESSAGE_PREFIX} Discarding #{transaction_description} because it's not included in the random sample (sampling rate = #{sample_rate})"
+        )
+      end
+    end
+
+    def finish(hub: nil)
+      super() # Span#finish doesn't take arguments
+
+      if @name.nil?
+        @name = UNLABELD_NAME
+      end
+
+      return unless @sampled
+
+      hub ||= Sentry.get_current_hub
+      event = hub.current_client.event_from_transaction(self)
+      hub.capture_event(event)
+    end
+
+    private
+
+    def generate_transaction_description
+      result = op.nil? ? "" : "<#{@op}> "
+      result += "transaction"
+      result += " <#{@name}>" if @name
+      result
+    end
+  end
+end

data/lib/sentry/transaction_event.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Sentry
+  class TransactionEvent < Event
+    ATTRIBUTES = %i(
+      event_id level timestamp start_timestamp
+      release environment server_name modules
+      user tags contexts extra
+      transaction platform sdk type
+    )
+
+    attr_accessor(*ATTRIBUTES)
+    attr_accessor :spans
+
+    def start_timestamp=(time)
+      @start_timestamp = time.is_a?(Time) ? time.to_f : time
+    end
+
+    def type
+      "transaction"
+    end
+
+    def to_hash
+      data = super
+      data[:spans] = @spans.map(&:to_hash) if @spans
+      data
+    end
+  end
+end

data/lib/sentry/transport.rb

@@ -32,10 +32,11 @@ module Sentry
       event
     rescue => e
       failed_for_exception(e, event)
+      nil
     end
 
     def generate_auth_header
-      now = Time.now.to_i.to_s
+      now = Sentry.utc_now.to_i
       fields = {
         'sentry_version' => PROTOCOL_VERSION,
         'sentry_client' => USER_AGENT,
@@ -48,11 +49,12 @@ module Sentry
 
     def encode(event_hash)
       event_id = event_hash[:event_id] || event_hash['event_id']
+      event_type = event_hash[:type] || event_hash['type']
 
       envelope = <<~ENVELOPE
-        {"event_id":"#{event_id}","dsn":"#{configuration.dsn.to_s}","sdk":#{Sentry.sdk_meta.to_json},"sent_at":"#{DateTime.now.rfc3339}"}
-        {"type":"event","content_type":"application/json"}
-        #{event_hash.to_json}
+        {"event_id":"#{event_id}","dsn":"#{configuration.dsn.to_s}","sdk":#{Sentry.sdk_meta.to_json},"sent_at":"#{Sentry.utc_now.iso8601}"}
+        {"type":"#{event_type}","content_type":"application/json"}
+        #{JSON.generate(event_hash)}
       ENVELOPE
 
       [CONTENT_TYPE, envelope]
@@ -86,7 +88,7 @@ module Sentry
     end
 
     def log_not_sending(event)
-      configuration.logger.warn(LOGGER_PROGNAME) { "Failed to submit event: #{Event.get_log_message(event.to_hash)}" }
+      configuration.logger.warn(LOGGER_PROGNAME) { "Failed to submit event. Unreported Event: #{Event.get_log_message(event.to_hash)}" }
     end
   end
 end

data/lib/sentry/transport/configuration.rb

@@ -1,19 +1,12 @@
 module Sentry
   class Transport
     class Configuration
-      attr_accessor :timeout, :open_timeout, :proxy, :ssl, :ssl_ca_file, :ssl_verification, :encoding, :http_adapter, :faraday_builder, :transport_class
+      attr_accessor :timeout, :open_timeout, :proxy, :ssl, :ssl_ca_file, :ssl_verification, :http_adapter, :faraday_builder, :transport_class
 
       def initialize
         @ssl_verification = true
         @open_timeout = 1
         @timeout = 2
-        @encoding = 'gzip'
-      end
-
-      def encoding=(encoding)
-        raise(Error, 'Unsupported encoding') unless %w(gzip json).include? encoding
-
-        @encoding = encoding
       end
 
       def transport_class=(klass)

data/lib/sentry/transport/http_transport.rb

@@ -23,9 +23,12 @@ module Sentry
       end
     rescue Faraday::Error => e
       error_info = e.message
-      if e.response && e.response[:headers]['x-sentry-error']
-        error_info += " Error in headers is: #{e.response[:headers]['x-sentry-error']}"
+
+      if e.response
+        error_info += "\nbody: #{e.response[:body]}"
+        error_info += " Error in headers is: #{e.response[:headers]['x-sentry-error']}" if e.response[:headers]['x-sentry-error']
       end
+
       raise Sentry::Error, error_info
     end
 

data/lib/sentry/transport/state.rb

@@ -9,7 +9,7 @@ module Sentry
         return true if @status == :online
 
         interval = @retry_after || [@retry_number, 6].min**2
-        return true if Time.now - @last_check >= interval
+        return true if Sentry.utc_now - @last_check >= interval
 
         false
       end
@@ -17,7 +17,7 @@ module Sentry
       def failure(retry_after = nil)
         @status = :error
         @retry_number += 1
-        @last_check = Time.now
+        @last_check = Sentry.utc_now
         @retry_after = retry_after
       end
 

data/lib/sentry/utils/request_id.rb

@@ -0,0 +1,16 @@
+module Sentry
+  module Utils
+    module RequestId
+      REQUEST_ID_HEADERS = %w(action_dispatch.request_id HTTP_X_REQUEST_ID).freeze
+
+      # Request ID based on ActionDispatch::RequestId
+      def self.read_from(env_hash)
+        REQUEST_ID_HEADERS.each do |key|
+          request_id = env_hash[key]
+          return request_id if request_id
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/sentry/version.rb

@@ -1,3 +1,3 @@
 module Sentry
-  VERSION = "0.1.2"
+  VERSION = "4.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 4.0.1
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-12 00:00:00.000000000 Z
+date: 2020-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -44,8 +44,9 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/sentry.rb
+- lib/sentry-ruby.rb
 - lib/sentry/backtrace.rb
+- lib/sentry/benchmarks/benchmark_transport.rb
 - lib/sentry/breadcrumb.rb
 - lib/sentry/breadcrumb/sentry_logger.rb
 - lib/sentry/breadcrumb_buffer.rb
@@ -65,8 +66,12 @@ files:
 - lib/sentry/logger.rb
 - lib/sentry/rack.rb
 - lib/sentry/rack/capture_exception.rb
-- lib/sentry/ruby.rb
+- lib/sentry/rack/tracing.rb
+- lib/sentry/rake.rb
 - lib/sentry/scope.rb
+- lib/sentry/span.rb
+- lib/sentry/transaction.rb
+- lib/sentry/transaction_event.rb
 - lib/sentry/transport.rb
 - lib/sentry/transport/configuration.rb
 - lib/sentry/transport/dummy_transport.rb
@@ -74,6 +79,7 @@ files:
 - lib/sentry/transport/state.rb
 - lib/sentry/utils/exception_cause_chain.rb
 - lib/sentry/utils/real_ip.rb
+- lib/sentry/utils/request_id.rb
 - lib/sentry/version.rb
 - sentry-ruby.gemspec
 homepage: https://github.com/getsentry/raven-ruby

data/lib/sentry/ruby.rb

@@ -1 +0,0 @@
-require "sentry"