sentry-ruby 0.1.1 → 4.0.0

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

@@ -26,31 +26,17 @@ module Sentry
 
       return nil unless encoded_data
 
-      begin
-        if configuration.async?
-          begin
-            # We have to convert to a JSON-like hash, because background job
-            # processors (esp ActiveJob) may not like weird types in the event hash
-            configuration.async.call(event.to_json_compatible)
-          rescue => e
-            configuration.logger.error(LOGGER_PROGNAME) { "async event sending failed: #{e.message}" }
-            send_data(encoded_data, content_type: content_type)
-          end
-        else
-          send_data(encoded_data, content_type: content_type)
-        end
-
-        state.success
-      rescue => e
-        failed_for_exception(e, event)
-        return
-      end
+      send_data(encoded_data, content_type: content_type)
 
+      state.success
       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,
@@ -63,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]
@@ -101,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.1"
+  VERSION = "4.0.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sentry-ruby
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 4.0.0
 platform: ruby
 authors:
 - Sentry Team
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-11-06 00:00:00.000000000 Z
+date: 2020-12-10 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
@@ -55,7 +56,6 @@ files:
 - lib/sentry/core_ext/object/duplicable.rb
 - lib/sentry/dsn.rb
 - lib/sentry/event.rb
-- lib/sentry/event/options.rb
 - lib/sentry/hub.rb
 - lib/sentry/interface.rb
 - lib/sentry/interfaces/exception.rb
@@ -66,16 +66,19 @@ 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/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
 - lib/sentry/transport/http_transport.rb
 - lib/sentry/transport/state.rb
-- lib/sentry/utils/deep_merge.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/event/options.rb

@@ -1,31 +0,0 @@
-module Sentry
-  class Event
-    class Options
-      attr_reader :message,
-        :user, :extra, :tags, :contexts,
-        :backtrace, :level, :fingerprint,
-        :server_name, :release, :environment
-
-      def initialize(
-        message: "",
-        user: {}, extra: {}, tags: {}, contexts: {},
-        backtrace: [], level: :error, fingerprint: [],
-        # nilable attributes because we'll fallback to the configuration's values
-        server_name: nil, release: nil, environment: nil
-      )
-        @message = message || ""
-        @user = user || {}
-        @extra = extra || {}
-        @tags = tags || {}
-        @contexts = contexts || {}
-        @backtrace = backtrace || []
-        @fingerprint = fingerprint || []
-        @level = level || :error
-        @server_name = server_name
-        @environment = environment
-        @release = release
-      end
-    end
-  end
-end
-

data/lib/sentry/ruby.rb

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

data/lib/sentry/utils/deep_merge.rb

@@ -1,22 +0,0 @@
-module Sentry
-  module Utils
-    # ported from ActiveSupport
-    module DeepMergeHash
-      def self.deep_merge(hash, other_hash, &block)
-        deep_merge!(hash, other_hash, &block)
-      end
-
-      def self.deep_merge!(hash, other_hash, &block)
-        hash.merge!(other_hash) do |key, this_val, other_val|
-          if this_val.is_a?(Hash) && other_val.is_a?(Hash)
-            deep_merge(this_val, other_val, &block)
-          elsif block_given?
-            block.call(key, this_val, other_val)
-          else
-            other_val
-          end
-        end
-      end
-    end
-  end
-end