sentry-ruby-core 5.27.0 → 5.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7120b3c35efe1a6fcadb730ebd099f9aa2c704f238d031959d604c7f56f245e2
-  data.tar.gz: f6548949011e59234ce7b90c04f6a3cc95fb0876e93ac598907f6fac7ccd4560
+  metadata.gz: 348b637110ce05f5a9cab224f11ec3e450163b1701eacc74500a306d8aece567
+  data.tar.gz: 97d7489043a301a9fdfed0d9ca31d38156c5082a0a2e43e83592d86e9eba939d
 SHA512:
-  metadata.gz: 36f20917b26eab934686bd2fe9ef03877637e165e06e3b7e650161beb070a1a06a1c670a8977ef8475af45f1d0a813af6881c2aba9d9ad6d8523daeb41881916
-  data.tar.gz: 1a8f620b58693aa0b30a81b9fdbdd94f78761c519fb49bbb9a57f6bb82296de8d248f3e537718ebb5325f730abac55da0ebd446db86d9e196f56532db1414097
+  metadata.gz: 406ca22f14011016d5a0082c32a434a7795c143dfdf272c281d966d204646d90188f39a57ca55c142ec63c032ed69f60c5ca3e068e1489dc647d3116f56d4d8f
+  data.tar.gz: cbea0779676929f05597e84da1e4cd7cc25fa0a6d383c8d08e6e26112e9bbe90403d14fdebaa8164a18d5db894ec286d22e5611da217a7bd5efb9279119ace33

data/lib/sentry/client.rb

@@ -195,9 +195,10 @@ module Sentry
     def event_from_log(message, level:, **options)
       return unless configuration.sending_allowed?
 
-      attributes = options.reject { |k, _| k == :level || k == :severity }
+      attributes = options.reject { |k, _| k == :level || k == :severity || k == :origin }
+      origin = options[:origin]
 
-      LogEvent.new(level: level, body: message, attributes: attributes)
+      LogEvent.new(level: level, body: message, attributes: attributes, origin: origin)
     end
 
     # Initializes an Event object with the given Transaction object.

data/lib/sentry/configuration.rb

@@ -400,7 +400,23 @@ module Sentry
 
       # allow extensions to add their hooks to the Configuration class
       def add_post_initialization_callback(&block)
-        post_initialization_callbacks << block
+        callbacks[:initialize][:after] << block
+      end
+
+      def before(event, &block)
+        callbacks[event.to_sym][:before] << block
+      end
+
+      def after(event, &block)
+        callbacks[event.to_sym][:after] << block
+      end
+
+      # @!visibility private
+      def callbacks
+        @callbacks ||= {
+          initialize: { before: [], after: [] },
+          configured: { before: [], after: [] }
+        }
       end
 
       def validations
@@ -444,6 +460,8 @@ module Sentry
     validate :profiles_sample_rate, optional: true, type: :numeric
 
     def initialize
+      run_callbacks(:before, :initialize)
+
       self.app_dirs_pattern = APP_DIRS_PATTERN
       self.debug = Sentry::Utils::EnvHelper.env_to_bool(ENV["SENTRY_DEBUG"])
       self.background_worker_threads = (processor_count / 2.0).ceil
@@ -494,13 +512,17 @@ module Sentry
 
       @transport = Transport::Configuration.new
       @cron = Cron::Configuration.new
-      @metrics = Metrics::Configuration.new
+      @metrics = Metrics::Configuration.new(self.sdk_logger)
       @structured_logging = StructuredLoggingConfiguration.new
       @gem_specs = Hash[Gem::Specification.map { |spec| [spec.name, spec.version.to_s] }] if Gem::Specification.respond_to?(:map)
 
-      run_post_initialization_callbacks
-
       self.max_log_events = LogEventBuffer::DEFAULT_MAX_EVENTS
+
+      run_callbacks(:after, :initialize)
+
+      yield(self) if block_given?
+
+      run_callbacks(:after, :configured)
     end
 
     def validate
@@ -784,8 +806,8 @@ module Sentry
       File.directory?("/etc/heroku") && !ENV["CI"]
     end
 
-    def run_post_initialization_callbacks
-      self.class.post_initialization_callbacks.each do |hook|
+    def run_callbacks(hook, event)
+      self.class.callbacks[event][hook].each do |hook|
         instance_eval(&hook)
       end
     end

data/lib/sentry/graphql.rb

@@ -4,6 +4,6 @@ Sentry.register_patch(:graphql) do |config|
   if defined?(::GraphQL::Schema) && defined?(::GraphQL::Tracing::SentryTrace) && ::GraphQL::Schema.respond_to?(:trace_with)
     ::GraphQL::Schema.trace_with(::GraphQL::Tracing::SentryTrace, set_transaction_name: true)
   else
-    config.logger.warn(Sentry::LOGGER_PROGNAME) { "You tried to enable the GraphQL integration but no GraphQL gem was detected. Make sure you have the `graphql` gem (>= 2.2.6) in your Gemfile." }
+    config.sdk_logger.warn(Sentry::LOGGER_PROGNAME) { "You tried to enable the GraphQL integration but no GraphQL gem was detected. Make sure you have the `graphql` gem (>= 2.2.6) in your Gemfile." }
   end
 end

data/lib/sentry/log_event.rb

@@ -29,9 +29,12 @@ module Sentry
       "sentry.address" => :server_name,
       "sentry.sdk.name" => :sdk_name,
       "sentry.sdk.version" => :sdk_version,
-      "sentry.message.template" => :template
+      "sentry.message.template" => :template,
+      "sentry.origin" => :origin
     }
 
+    PARAMETER_PREFIX = "sentry.message.parameter"
+
     USER_ATTRIBUTES = {
       "user.id" => :user_id,
       "user.name" => :user_username,
@@ -40,7 +43,7 @@ module Sentry
 
     LEVELS = %i[trace debug info warn error fatal].freeze
 
-    attr_accessor :level, :body, :template, :attributes, :user
+    attr_accessor :level, :body, :template, :attributes, :user, :origin
 
     attr_reader :configuration, *(SERIALIZEABLE_ATTRIBUTES - %i[level body attributes])
 
@@ -51,6 +54,7 @@ module Sentry
       parent_span_id
       sdk_name
       sdk_version
+      template
       timestamp
       trace_id
       user_id
@@ -79,6 +83,7 @@ module Sentry
       @template = @body if is_template?
       @attributes = options[:attributes] || DEFAULT_ATTRIBUTES
       @user = options[:user] || {}
+      @origin = options[:origin]
       @contexts = {}
     end
 
@@ -146,6 +151,10 @@ module Sentry
       user[:email]
     end
 
+    def serialize_template
+      template if has_parameters?
+    end
+
     def serialize_attributes
       hash = {}
 
@@ -185,11 +194,11 @@ module Sentry
 
         if parameters.is_a?(Hash)
           parameters.each do |key, value|
-            attributes["sentry.message.parameter.#{key}"] = value
+            attributes["#{PARAMETER_PREFIX}.#{key}"] = value
           end
         else
           parameters.each_with_index do |param, index|
-            attributes["sentry.message.parameter.#{index}"] = param
+            attributes["#{PARAMETER_PREFIX}.#{index}"] = param
           end
         end
       end
@@ -202,5 +211,9 @@ module Sentry
     def is_template?
       body.include?("%s") || TOKEN_REGEXP.match?(body)
     end
+
+    def has_parameters?
+      attributes.keys.any? { |key| key.start_with?(PARAMETER_PREFIX) }
+    end
   end
 end

data/lib/sentry/metrics/configuration.rb

@@ -4,12 +4,13 @@ module Sentry
   module Metrics
     class Configuration
       include ArgumentCheckingHelper
+      include LoggingHelper
 
       # Enable metrics usage.
       # Starts a new {Sentry::Metrics::Aggregator} instance to aggregate metrics
       # and a thread to aggregate flush every 5 seconds.
       # @return [Boolean]
-      attr_accessor :enabled
+      attr_reader :enabled
 
       # Enable code location reporting.
       # Will be sent once per day.
@@ -32,11 +33,20 @@ module Sentry
       # @return [Proc, nil]
       attr_reader :before_emit
 
-      def initialize
+      def initialize(sdk_logger)
+        @sdk_logger = sdk_logger
         @enabled = false
         @enable_code_locations = true
       end
 
+      def enabled=(value)
+        log_warn <<~MSG
+          `config.metrics` is now deprecated and will be removed in the next major.
+        MSG
+
+        @enabled = value
+      end
+
       def before_emit=(value)
         check_callable!("metrics.before_emit", value)
 

data/lib/sentry/metrics.rb

@@ -19,22 +19,28 @@ module Sentry
 
     class << self
       def increment(key, value = 1.0, unit: "none", tags: {}, timestamp: nil)
+        log_deprecation
         Sentry.metrics_aggregator&.add(:c, key, value, unit: unit, tags: tags, timestamp: timestamp)
       end
 
       def distribution(key, value, unit: "none", tags: {}, timestamp: nil)
+        log_deprecation
         Sentry.metrics_aggregator&.add(:d, key, value, unit: unit, tags: tags, timestamp: timestamp)
       end
 
       def set(key, value, unit: "none", tags: {}, timestamp: nil)
+        log_deprecation
         Sentry.metrics_aggregator&.add(:s, key, value, unit: unit, tags: tags, timestamp: timestamp)
       end
 
       def gauge(key, value, unit: "none", tags: {}, timestamp: nil)
+        log_deprecation
         Sentry.metrics_aggregator&.add(:g, key, value, unit: unit, tags: tags, timestamp: timestamp)
       end
 
       def timing(key, unit: "second", tags: {}, timestamp: nil, &block)
+        log_deprecation
+
         return unless block_given?
         return yield unless DURATION_UNITS.include?(unit)
 
@@ -51,6 +57,12 @@ module Sentry
         Sentry.metrics_aggregator&.add(:d, key, value, unit: unit, tags: tags, timestamp: timestamp)
         result
       end
+
+      def log_deprecation
+        Sentry.sdk_logger.warn(LOGGER_PROGNAME) do
+          "`Sentry::Metrics` is now deprecated and will be removed in the next major."
+        end
+      end
     end
   end
 end

data/lib/sentry/std_lib_logger.rb

@@ -12,11 +12,16 @@ module Sentry
       4 => :fatal
     }.freeze
 
+    ORIGIN = "auto.logger.ruby.std_logger"
+
     def add(severity, message = nil, progname = nil, &block)
       result = super
 
       return unless Sentry.initialized? && Sentry.get_current_hub
 
+      # Only process logs that meet or exceed the logger's level
+      return result if severity < level
+
       # exclude sentry SDK logs -- to prevent recursive log action,
       # do not process internal logs again
       if message.nil? && progname != Sentry::Logger::PROGNAME
@@ -32,7 +37,7 @@ module Sentry
         message = message.to_s.strip
 
         if !message.nil? && message != Sentry::Logger::PROGNAME && method = SEVERITY_MAP[severity]
-          Sentry.logger.send(method, message)
+          Sentry.logger.send(method, message, origin: ORIGIN)
         end
       end
 

data/lib/sentry/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sentry
-  VERSION = "5.27.0"
+  VERSION = "5.28.0"
 end

data/lib/sentry-ruby.rb

@@ -239,8 +239,7 @@ module Sentry
     # @yieldparam config [Configuration]
     # @return [void]
     def init(&block)
-      config = Configuration.new
-      yield(config) if block_given?
+      config = Configuration.new(&block)
 
       config.detect_release
       apply_patches(config)
@@ -500,6 +499,7 @@ module Sentry
     # @param [Hash] options Extra log event options
     # @option options [Symbol] level The log level (:trace, :debug, :info, :warn, :error, :fatal)
     # @option options [Integer] severity The severity number according to the Sentry Logs Protocol
+    # @option options [String] origin The origin of the log event (e.g., "auto.db.rails", "manual")
     # @option options [Hash] Additional attributes to include with the log
     #
     # @example Direct usage (prefer using Sentry.logger instead)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sentry-ruby-core
 version: !ruby/object:Gem::Version
-  version: 5.27.0
+  version: 5.28.0
 platform: ruby
 authors:
 - Sentry Team
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.27.0
+        version: 5.28.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.27.0
+        version: 5.28.0
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement