chronos-ruby 0.6.0.pre.1 → 0.7.0.pre.1

data/lib/chronos/core/sql_normalizer.rb

@@ -0,0 +1,114 @@
+require "digest"
+
+module Chronos
+  module Core
+    # Produces bounded, value-free SQL metadata for aggregation and local signals.
+    #
+    # @responsibility Remove comments/literals and derive operation, table, and fingerprint.
+    # @motivation SQL metrics need stable low-cardinality identity without bind values.
+    # @limits It is a defensive lexer, not a complete dialect-specific SQL parser.
+    # @collaborators Rails notification adapter and APM aggregator.
+    # @thread_safety Instances are stateless and safe to share.
+    # @compatibility Ruby 2.2.10 through Ruby 2.6; no ActiveRecord dependency.
+    # @example
+    #   SqlNormalizer.new.call("SELECT * FROM users WHERE id = 42")
+    # @errors Malformed or unreadable input returns bounded unknown metadata.
+    # @performance Input and normalized output are capped before fingerprinting.
+    class SqlNormalizer
+      MAX_SQL_BYTES = 4096
+      MAX_NORMALIZED_BYTES = 512
+      KEYWORDS = %w(
+        select insert update delete from into where join left right inner outer on set values
+        and or order group by having limit offset as distinct begin commit rollback savepoint release
+      ).freeze
+
+      def call(sql, metadata = {})
+        normalized = normalize(sql)
+        {
+          "adapter" => adapter(metadata), "operation" => operation(normalized),
+          "table" => table(normalized), "normalized_query" => normalized,
+          "fingerprint" => Digest::SHA256.hexdigest(normalized),
+          "name" => value(metadata, :name).to_s,
+          "cached" => value(metadata, :cached) == true,
+          "role" => optional_string(metadata, :role, :connection_role),
+          "shard" => optional_string(metadata, :shard, :connection_shard),
+          "source" => bounded(value(metadata, :source).to_s, 256),
+          "error_class" => error_class(metadata)
+        }.delete_if { |_key, child| child.nil? || child == "" }
+      rescue StandardError
+        {"operation" => "UNKNOWN", "normalized_query" => "", "fingerprint" => Digest::SHA256.hexdigest("")}
+      end
+
+      private
+
+      def normalize(sql)
+        text = bounded(sql.to_s, MAX_SQL_BYTES)
+        text = text.gsub(%r{/\*.*?\*/}m, " ").gsub(/--[^\r\n]*/, " ")
+        text = text.gsub(/'(?:''|[^'])*'/, "?")
+        text = text.gsub(/\$([A-Za-z_][A-Za-z0-9_]*)?\$.*?\$\1\$/m, "?")
+        text = text.gsub(/\b(?:0x[0-9a-f]+|\d+(?:\.\d+)?)\b/i, "?")
+        text = text.gsub(/\b(?:true|false|null)\b/i, "?")
+        text = text.gsub(/\(\s*\?(?:\s*,\s*\?)+\s*\)/, "(?)")
+        text = text.gsub(/\s+/, " ").strip
+        KEYWORDS.each { |keyword| text.gsub!(/\b#{keyword}\b/i, keyword.upcase) }
+        bounded(text, MAX_NORMALIZED_BYTES)
+      end
+
+      def operation(normalized)
+        candidate = normalized.to_s.split(/\s+/, 2).first.to_s.upcase
+        candidate =~ /\A[A-Z]+\z/ ? candidate : "UNKNOWN"
+      end
+
+      def table(normalized)
+        match = normalized.match(/\b(?:FROM|INTO|UPDATE|JOIN)\s+["`\[]?([A-Za-z0-9_.-]+)/i)
+        bounded(match && match[1].to_s, 128)
+      end
+
+      def adapter(metadata)
+        direct = value(metadata, :adapter)
+        return bounded(direct.to_s, 64) unless direct.to_s.empty?
+
+        connection = value(metadata, :connection)
+        return "" unless connection && connection.respond_to?(:adapter_name)
+
+        bounded(connection.adapter_name.to_s, 64)
+      rescue StandardError
+        ""
+      end
+
+      def error_class(metadata)
+        error = value(metadata, :exception_object) || value(metadata, :exception)
+        return error.class.name.to_s if error.is_a?(Exception)
+        return Array(error).first.to_s unless error.nil?
+
+        ""
+      rescue StandardError
+        ""
+      end
+
+      def optional_string(metadata, *names)
+        names.each do |name|
+          candidate = value(metadata, name)
+          return bounded(candidate.to_s, 64) unless candidate.to_s.empty?
+        end
+        ""
+      end
+
+      def value(hash, key)
+        return nil unless hash.is_a?(Hash)
+
+        hash.key?(key) ? hash[key] : hash[key.to_s]
+      end
+
+      def bounded(value, limit)
+        text = value.to_s
+        text = text.scrub("?") if text.respond_to?(:scrub)
+        return text if text.bytesize <= limit
+
+        text.byteslice(0, limit)
+      rescue StandardError
+        ""
+      end
+    end
+  end
+end

data/lib/chronos/core/telemetry_event.rb

@@ -16,7 +16,7 @@ module Chronos
     # @errors Unsupported types raise ArgumentError during construction.
     # @performance Construction is linear in supplied context and payload size.
     class TelemetryEvent
-      TYPES = %w(request query job cache).freeze
+      TYPES = %w(request query job cache metric_batch).freeze
 
       attr_reader :event_id, :event_type, :timestamp, :context, :payload
 

data/lib/chronos/integrations/rack/middleware.rb

@@ -38,11 +38,14 @@ module Chronos
           response = @app.call(env)
           status = response[0]
           headers = response[1]
-          add_request_breadcrumb("request completed", dynamic_request_context(base, status, headers, started_at))
+          context = dynamic_request_context(base, status, headers, started_at)
+          add_request_breadcrumb("request completed", context)
+          record_request_metric(context)
           response
         rescue Exception => error # rubocop:disable Lint/RescueException
           context = dynamic_request_context(base, 500, nil, started_at)
           notify_safely(error, context)
+          record_request_metric(context)
           raise
         end
 
@@ -141,6 +144,21 @@ module Chronos
           )
         end
 
+        def record_request_metric(context)
+          request = context[:context]["request"]
+          payload = {
+            "kind" => "rack", "route" => request["route"], "method" => request["method"],
+            "status" => request["status"], "duration_ms" => request["duration_ms"]
+          }
+          if @notifier.respond_to?(:record_event_once)
+            @notifier.record_event_once("request", "request", payload)
+          elsif @notifier.respond_to?(:record_event)
+            @notifier.record_event("request", payload)
+          end
+        rescue StandardError
+          false
+        end
+
         def hash_value(value)
           value.is_a?(Hash) ? value : {}
         end

data/lib/chronos/integrations/sidekiq.rb

@@ -176,6 +176,8 @@ module Chronos
           propagated = {} unless propagated.is_a?(Hash)
           {
             :context => propagated.merge("job" => job_context(payload)),
+            :parameters => {"arguments" => payload["arguments"]},
+            :tags => payload["tags"],
             :__chronos_captured_exceptions => {}
           }
         end

data/lib/chronos/rails/notifications_subscriber.rb

@@ -29,6 +29,7 @@ module Chronos
       def initialize(notifier = Chronos, notifications = nil)
         @notifier = notifier
         @notifications = notifications || active_support_notifications
+        @sql_normalizer = Core::SqlNormalizer.new
       end
 
       def install
@@ -105,7 +106,7 @@ module Chronos
           "route" => route(payload),
           "duration_ms" => duration, "parameters" => hash(value(payload, :params))
         }
-        @notifier.record_event("request", data)
+        record_once("request", "request", data)
       end
 
       def render_template(payload, duration)
@@ -117,10 +118,15 @@ module Chronos
       end
 
       def sql(payload, duration)
-        data = {
-          "name" => value(payload, :name).to_s, "cached" => value(payload, :cached) == true,
-          "duration_ms" => duration
+        metadata = {
+          :name => value(payload, :name), :cached => value(payload, :cached),
+          :adapter => value(payload, :adapter), :connection => value(payload, :connection),
+          :role => value(payload, :connection_role) || value(payload, :role),
+          :shard => value(payload, :connection_shard) || value(payload, :shard),
+          :exception_object => value(payload, :exception_object), :exception => value(payload, :exception)
         }
+        metadata[:source] = sampled_query_source if duration >= slow_query_threshold
+        data = @sql_normalizer.call(value(payload, :sql), metadata).merge("duration_ms" => duration)
         @notifier.record_event("query", data)
       end
 
@@ -198,6 +204,32 @@ module Chronos
       rescue StandardError
         ""
       end
+
+      def record_once(key, event_type, payload)
+        if @notifier.respond_to?(:record_event_once)
+          @notifier.record_event_once(key, event_type, payload)
+        else
+          @notifier.record_event(event_type, payload)
+        end
+      end
+
+      def slow_query_threshold
+        options = @notifier.respond_to?(:apm_integration_options) ? @notifier.apm_integration_options : {}
+        (options[:slow_query_threshold_ms] || 500.0).to_f
+      rescue StandardError
+        500.0
+      end
+
+      def sampled_query_source
+        options = @notifier.respond_to?(:apm_integration_options) ? @notifier.apm_integration_options : {}
+        root = options[:root_directory].to_s
+        frame = caller.find do |line|
+          (root.empty? || line.start_with?(root)) && line !~ %r{/lib/chronos/}
+        end
+        frame.to_s.sub(/:in .*/, "")[0, 256]
+      rescue StandardError
+        ""
+      end
     end
   end
 end

data/lib/chronos/version.rb

@@ -1,4 +1,4 @@
 module Chronos
   # Current version of the legacy Chronos Ruby agent.
-  VERSION = "0.6.0.pre.1".freeze
+  VERSION = "0.7.0.pre.1".freeze
 end

data/lib/chronos.rb

@@ -16,6 +16,8 @@ require "chronos/core/sanitizer"
 require "chronos/core/safe_serializer"
 require "chronos/core/payload_serializer"
 require "chronos/core/telemetry_event"
+require "chronos/core/sql_normalizer"
+require "chronos/core/metric_aggregate"
 require "chronos/ports/transport"
 require "chronos/ports/context_store"
 require "chronos/internal/safe_logger"
@@ -30,6 +32,7 @@ require "chronos/application/circuit_breaker"
 require "chronos/application/remote_configuration"
 require "chronos/application/delivery_pipeline"
 require "chronos/application/capture_exception"
+require "chronos/application/apm_aggregator"
 require "chronos/application/capture_telemetry"
 require "chronos/agent"
 require "chronos/integrations"
@@ -104,6 +107,20 @@ module Chronos
       false
     end
 
+    def record_event_once(key, event_type, payload = {}, context = {})
+      agent = current_agent
+      agent ? agent.record_event_once(key, event_type, payload, context) : false
+    rescue StandardError
+      false
+    end
+
+    def apm_integration_options
+      agent = current_agent
+      agent ? agent.apm_integration_options : {:enabled => false}
+    rescue StandardError
+      {:enabled => false}
+    end
+
     # Returns only trace/request identifiers for optional process-boundary adapters.
     def propagation_context
       agent = current_agent

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chronos-ruby
 version: !ruby/object:Gem::Version
-  version: 0.6.0.pre.1
+  version: 0.7.0.pre.1
 platform: ruby
 authors:
 - Antonio Jefferson
@@ -86,6 +86,7 @@ files:
 - LICENSE.txt
 - README.md
 - SECURITY.md
+- contracts/apm-batch-v1.schema.json
 - contracts/event-v1.schema.json
 - contracts/rack-context-v1.schema.json
 - contracts/sidekiq-job-v1.schema.json
@@ -99,11 +100,13 @@ files:
 - docs/adr/ADR-012-rack-context-isolation.md
 - docs/adr/ADR-013-legacy-rails-notifications.md
 - docs/adr/ADR-014-sidekiq-envelope-context.md
+- docs/adr/ADR-015-bounded-apm-aggregation.md
 - docs/architecture.md
 - docs/compatibility.md
 - docs/configuration.md
 - docs/data-collected.md
 - docs/examples/plain-ruby.md
+- docs/modules/apm-aggregation.md
 - docs/modules/async-queue.md
 - docs/modules/configuration.md
 - docs/modules/notice-pipeline.md
@@ -125,6 +128,7 @@ files:
 - lib/chronos/adapters/thread_local_context_store.rb
 - lib/chronos/agent.rb
 - lib/chronos/application.rb
+- lib/chronos/application/apm_aggregator.rb
 - lib/chronos/application/capture_exception.rb
 - lib/chronos/application/capture_telemetry.rb
 - lib/chronos/application/circuit_breaker.rb
@@ -132,12 +136,14 @@ files:
 - lib/chronos/application/remote_configuration.rb
 - lib/chronos/application/retry_policy.rb
 - lib/chronos/configuration.rb
+- lib/chronos/configuration/apm_validation.rb
 - lib/chronos/configuration/snapshot.rb
 - lib/chronos/configuration/validation.rb
 - lib/chronos/core.rb
 - lib/chronos/core/backtrace_parser.rb
 - lib/chronos/core/breadcrumb.rb
 - lib/chronos/core/exception_cause_collector.rb
+- lib/chronos/core/metric_aggregate.rb
 - lib/chronos/core/notice.rb
 - lib/chronos/core/notice_builder.rb
 - lib/chronos/core/payload_serializer.rb
@@ -145,6 +151,7 @@ files:
 - lib/chronos/core/safe_serializer.rb
 - lib/chronos/core/sanitizer.rb
 - lib/chronos/core/sensitive_value_filter.rb
+- lib/chronos/core/sql_normalizer.rb
 - lib/chronos/core/telemetry_event.rb
 - lib/chronos/errors.rb
 - lib/chronos/integrations.rb