elastic-apm 3.15.1 → 4.2.0

data/lib/elastic_apm/spies/sqs.rb

@@ -50,28 +50,21 @@ module ElasticAPM
       end
 
       def self.span_context(queue_name, region)
-        cloud = ElasticAPM::Span::Context::Destination::Cloud.new(region: region)
-
         ElasticAPM::Span::Context.new(
-          message: {
-            queue_name: queue_name
-          },
+          message: { queue_name: queue_name },
           destination: {
-            resource: [SUBTYPE, queue_name].compact.join('/'),
-            type: TYPE,
-            name: SUBTYPE,
-            cloud: cloud
+            service: { resource: "#{SUBTYPE}/#{queue_name}" },
+            cloud: { region: region }
           }
         )
       end
 
-      def install
-        ::Aws::SQS::Client.class_eval do
-          alias :send_message_without_apm :send_message
-
+      # @api private
+      module Ext
+        def self.prepended(mod)
           def send_message(params = {}, options = {})
             unless (transaction = ElasticAPM.current_transaction)
-              return send_message_without_apm(params, options)
+              return super(params, options)
             end
 
             queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
@@ -98,16 +91,14 @@ module ElasticAPM
               end
 
               ElasticAPM::Spies::SQSSpy.without_net_http do
-                send_message_without_apm(params, options)
+                super(params, options)
               end
             end
           end
 
-          alias :send_message_batch_without_apm :send_message_batch
-
           def send_message_batch(params = {}, options = {})
             unless (transaction = ElasticAPM.current_transaction)
-              return send_message_batch_without_apm(params, options)
+              return super(params, options)
             end
 
             queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
@@ -127,6 +118,7 @@ module ElasticAPM
               context: context
             ) do |span|
               trace_context = span&.trace_context || transaction.trace_context
+
               trace_context.apply_headers do |key, value|
                 params[:entries].each do |message|
                   message[:message_attributes] ||= {}
@@ -137,16 +129,14 @@ module ElasticAPM
               end
 
               ElasticAPM::Spies::SQSSpy.without_net_http do
-                send_message_batch_without_apm(params, options)
+                super(params, options)
               end
             end
           end
 
-          alias :receive_message_without_apm :receive_message
-
           def receive_message(params = {}, options = {})
             unless ElasticAPM.current_transaction
-              return receive_message_without_apm(params, options)
+              return super(params, options)
             end
 
             queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
@@ -166,16 +156,14 @@ module ElasticAPM
               context: context
             ) do
               ElasticAPM::Spies::SQSSpy.without_net_http do
-                receive_message_without_apm(params, options)
+                super(params, options)
               end
             end
           end
 
-          alias :delete_message_without_apm :delete_message
-
           def delete_message(params = {}, options = {})
             unless ElasticAPM.current_transaction
-              return delete_message_without_apm(params, options)
+              return super(params, options)
             end
 
             queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
@@ -194,16 +182,14 @@ module ElasticAPM
               context: context
             ) do
               ElasticAPM::Spies::SQSSpy.without_net_http do
-                delete_message_without_apm(params, options)
+                super(params, options)
               end
             end
           end
 
-          alias :delete_message_batch_without_apm :delete_message_batch
-
           def delete_message_batch(params = {}, options = {})
             unless ElasticAPM.current_transaction
-              return delete_message_batch_without_apm(params, options)
+              return super(params, options)
             end
 
             queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
@@ -223,12 +209,16 @@ module ElasticAPM
               context: context
             ) do
               ElasticAPM::Spies::SQSSpy.without_net_http do
-                delete_message_batch_without_apm(params, options)
+                super(params, options)
               end
             end
           end
         end
       end
+
+      def install
+        ::Aws::SQS::Client.prepend(Ext)
+      end
     end
 
     register(

data/lib/elastic_apm/spies/tilt.rb

@@ -24,19 +24,20 @@ module ElasticAPM
     class TiltSpy
       TYPE = 'template.tilt'
 
-      def install
-        ::Tilt::Template.class_eval do
-          alias render_without_apm render
-
-          def render(*args, &block)
-            name = options[:__elastic_apm_template_name] || 'Unknown template'
+      # @api private
+      module Ext
+        def render(*args, &block)
+          name = options[:__elastic_apm_template_name] || 'Unknown template'
 
-            ElasticAPM.with_span name, TYPE do
-              render_without_apm(*args, &block)
-            end
+          ElasticAPM.with_span name, TYPE do
+            super(*args, &block)
           end
         end
       end
+
+      def install
+        ::Tilt::Template.prepend(Ext)
+      end
     end
 
     register 'Tilt::Template', 'tilt/template', TiltSpy.new

data/lib/elastic_apm/sql/tokenizer.rb

@@ -69,7 +69,7 @@ module ElasticAPM
         when '['   then scan_quoted_indentifier(']')
         when '('   then LPAREN
         when ')'   then RPAREN
-        when '/'   then scan_bracketed_comment
+        when '/'   then scan_bracketed_or_cql_comment
         when '-'   then scan_simple_comment
         when "'"   then scan_string_literal
         when ALPHA then scan_keyword_or_identifier(possible_keyword: true)
@@ -110,7 +110,7 @@ module ElasticAPM
             next next_char
           end
 
-          next next_char if peek =~ ALPHA
+          next next_char if ALPHA.match?(peek)
 
           break
         end
@@ -185,10 +185,16 @@ module ElasticAPM
         IDENT
       end
 
+      def scan_bracketed_or_cql_comment
+        case peek_char
+        when '*' then scan_bracketed_comment
+        when '/' then scan_cql_comment
+        else OTHER
+        end
+      end
+
       # rubocop:disable Metrics/CyclomaticComplexity
       def scan_bracketed_comment
-        return OTHER unless peek_char == '*'
-
         nesting = 1
 
         while (char = next_char)
@@ -207,6 +213,16 @@ module ElasticAPM
       end
       # rubocop:enable Metrics/CyclomaticComplexity
 
+      def scan_cql_comment
+        return OTHER unless peek_char == '/'
+
+        while (char = next_char)
+          break if char == "\n"
+        end
+
+        COMMENT
+      end
+
       def scan_simple_comment
         return OTHER unless peek_char == '-'
 
@@ -251,7 +267,7 @@ module ElasticAPM
           when 'e', 'E'
             return NUMBER if exponent
             next_char
-            next_char if peek_char =~ /[+-]/
+            next_char if /[+-]/.match?(peek_char)
           else break
           end
         end

data/lib/elastic_apm/stacktrace_builder.rb

@@ -38,7 +38,9 @@ module ElasticAPM
 
     def initialize(config)
       @config = config
-      @cache = Util::LruCache.new(2048, &method(:build_frame))
+      @cache = Util::LruCache.new(2048) do |cache, frame|
+        build_frame(cache, frame)
+      end
     end
 
     attr_reader :config

data/lib/elastic_apm/subscriber.rb

@@ -45,6 +45,7 @@ module ElasticAPM
     # AS::Notifications API
 
     Notification = Struct.new(:id, :span)
+
     def start(name, id, payload)
       return unless (transaction = @agent.current_transaction)
 

data/lib/elastic_apm/trace_context.rb

@@ -29,10 +29,9 @@ module ElasticAPM
 
     def initialize(
       traceparent: nil,
-      tracestate: nil,
-      **legacy_traceparent_attrs
+      tracestate: nil
     )
-      @traceparent = traceparent || Traceparent.new(**legacy_traceparent_attrs)
+      @traceparent = traceparent || Traceparent.new
       @tracestate = tracestate || Tracestate.new
     end
 
@@ -42,15 +41,13 @@ module ElasticAPM
       :version, :trace_id, :id, :parent_id, :ensure_parent_id, :recorded?
 
     class << self
-      def parse(legacy_header = nil, env: nil, metadata: nil)
-        unless legacy_header || env || metadata
+      def parse(env: nil, metadata: nil)
+        unless env || metadata
           raise ArgumentError, 'TraceContext expects env:, metadata: ' \
             'or single argument header string'
         end
 
-        if legacy_header
-          legacy_parse_from_header(legacy_header)
-        elsif env
+        if env
           trace_context_from_env(env)
         elsif metadata
           trace_context_from_metadata(metadata)
@@ -88,11 +85,6 @@ module ElasticAPM
 
         new(traceparent: parent, tracestate: state)
       end
-
-      def legacy_parse_from_header(header)
-        parent = Traceparent.parse(header)
-        new(traceparent: parent)
-      end
     end
 
     def child

data/lib/elastic_apm/trace_context/traceparent.rb

@@ -22,7 +22,7 @@ module ElasticAPM
     # @api private
     class Traceparent
       VERSION = '00'
-      HEX_REGEX = /[^[:xdigit:]]/.freeze
+      NON_HEX_REGEX = /[^[:xdigit:]]/.freeze
 
       TRACE_ID_LENGTH = 16
       ID_LENGTH = 8
@@ -30,14 +30,13 @@ module ElasticAPM
       def initialize(
         version: VERSION,
         trace_id: nil,
-        span_id: nil,
+        parent_id: nil,
         id: nil,
         recorded: true
       )
         @version = version
         @trace_id = trace_id || hex(TRACE_ID_LENGTH)
-        # TODO: rename span_id kw arg to parent_id with next major version bump
-        @parent_id = span_id
+        @parent_id = parent_id
         @id = id || hex(ID_LENGTH)
         @recorded = recorded
       end
@@ -56,8 +55,8 @@ module ElasticAPM
               values[-1] = Util.hex_to_bits(values[-1])
             end
 
-          raise_invalid(header) if HEX_REGEX =~ t.trace_id
-          raise_invalid(header) if HEX_REGEX =~ t.parent_id
+          raise_invalid(header) if NON_HEX_REGEX.match?(t.trace_id)
+          raise_invalid(header) if NON_HEX_REGEX.match?(t.parent_id)
         end
       end
 

data/lib/elastic_apm/transport/connection.rb

@@ -105,7 +105,7 @@ module ElasticAPM
         @close_task&.cancel
         @close_task =
           Concurrent::ScheduledTask.execute(@config.api_request_time) do
-            flush(:timeout)
+            flush(:scheduled_flush)
           end
       end
     end

data/lib/elastic_apm/transport/connection/http.rb

@@ -74,7 +74,7 @@ module ElasticAPM
           debug '%s: Closing request with reason %s', thread_str, reason
           @closed.make_true
 
-          @wr&.close(reason)
+          @wr&.close
           return if @request.nil? || @request&.join(5)
 
           error(
@@ -85,7 +85,7 @@ module ElasticAPM
         end
 
         def closed?
-          @closed.true?
+          @rd.closed? && @closed.true?
         end
 
         def inspect
@@ -117,6 +117,8 @@ module ElasticAPM
               error(
                 "Couldn't establish connection to APM Server:\n%p", e.inspect
               )
+            ensure
+              @rd&.close
             end
           end
         end

data/lib/elastic_apm/transport/connection/proxy_pipe.rb

@@ -62,8 +62,7 @@ module ElasticAPM
             @io = Zlib::GzipWriter.new(io)
           end
 
-          def close(reason = nil)
-            debug("Closing writer with reason #{reason}")
+          def close
             io.close
           end
 

data/lib/elastic_apm/transport/filters/hash_sanitizer.rb

@@ -26,17 +26,8 @@ module ElasticAPM
       class HashSanitizer
         FILTERED = '[FILTERED]'
 
-        # DEPRECATED: Remove these additions in next major version
-        LEGACY_KEY_FILTERS = [/cookie/i, /auth/i].freeze
-
-        # DEPRECATED: Remove this check in next major version
-        VALUE_FILTERS = [
-          # (probably) credit card number
-          /^\d{4}[- ]?\d{4}[- ]?\d{4}[- ]?\d{4}$/
-        ].freeze
-
         def initialize(key_patterns:)
-          @key_patterns = key_patterns + LEGACY_KEY_FILTERS
+          @key_patterns = key_patterns
         end
 
         attr_accessor :key_patterns
@@ -48,18 +39,13 @@ module ElasticAPM
         def strip_from!(obj)
           return unless obj.is_a?(Hash)
 
-          obj.each do |k, v|
-            if filter_key?(k)
-              next obj[k] = FILTERED
-            end
-
+          obj.each_pair do |k, v|
             case v
             when Hash
               strip_from!(v)
-            when String
-              if filter_value?(v)
-                obj[k] = FILTERED
-              end
+            else
+              next unless filter_key?(k)
+              obj[k] = FILTERED
             end
           end
         end
@@ -67,10 +53,6 @@ module ElasticAPM
         def filter_key?(key)
           @key_patterns.any? { |regex| regex.match(key) }
         end
-
-        def filter_value?(value)
-          VALUE_FILTERS.any? { |regex| regex.match(value) }
-        end
       end
     end
   end

data/lib/elastic_apm/transport/serializers/metadata_serializer.rb

@@ -65,7 +65,7 @@ module ElasticAPM
             }
 
           if (node_name = service.node_name)
-            base[:node] = { name: keyword_field(node_name) }
+            base[:node] = { configured_name: keyword_field(node_name) }
           end
 
           base
@@ -81,7 +81,8 @@ module ElasticAPM
 
         def build_system(system)
           {
-            hostname: keyword_field(system.hostname),
+            detected_hostname: keyword_field(system.detected_hostname),
+            configured_hostname: keyword_field(system.configured_hostname),
             architecture: keyword_field(system.architecture),
             platform: keyword_field(system.platform),
             kubernetes: keyword_object(system.kubernetes),