elastic-apm 3.14.0 → 3.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f35288b7b9e691e200b5ae0183f6cc81ba40cb3cf520f11e3319e6a31461b8d2
-  data.tar.gz: '0487ec48ab081691b85d410711402a9777e9a2c815e5384148d2f33ee0d48e89'
+  metadata.gz: ee845be05bcd6dbd56efb3f21372b0abfede8c37b4c7f9580b82ea6a24238fc5
+  data.tar.gz: 46365fa74214843bc882163c917b429beba61d35f65032f45321ce0e128ecf38
 SHA512:
-  metadata.gz: 17f18165f940d10a57a0fec94f1f9c5311e0d4c4769273f30a749c2512cc125f912f53b15b78f7a90bb5dc8e6c41dbdf7ecb7b9ecc669f581e0768e22d30771f
-  data.tar.gz: 0d2e0655d61495157b947d1ccd441511ee1508ba32b7acbe00dc6deeebd343efa708c6755afa9fc8a9f150cda3224eac52f42f7841c6eeb704bf40bb85c68fb2
+  metadata.gz: 821287e4a80cdf707c6bcddb50ff1cf9592e5410c99e09b69dbebbcc4915a9aae968f8bc1704454ad06a964f173e49b8534a5923d059ef4a70417b74b2b285e8
+  data.tar.gz: 5344fb235b378cff3610c0e49771737ba4c906343025110eb38e277f0cb27a6419e76834baf275ebfb2d59ea8e4b94298b65ebe757dcd7fd9cd0d63727a4fe77

data/.rubocop.yml

@@ -7,7 +7,7 @@ AllCops:
     - 'bench/*'
     - 'spec/support/helloworld_pb.rb'
     - 'spec/support/helloworld_services_pb.rb'
-    - 'features/step_definitions/stepdefs.rb'
+    - 'features/**/*'
 
 require:
   - rubocop-performance

data/CHANGELOG.asciidoc

@@ -35,12 +35,29 @@ endif::[]
 [[release-notes-3.x]]
 === Ruby Agent version 3.x
 
+[[release-notes-3.15.0]]
+==== 3.15.0 (2021-03-22)
+
+[float]
+===== Changed
+
+- Changed DynamoDB instrumentation to match spec. Span names now follow the format `DynamoDB
+  Operation [table]` {pull}976[#976]
+
+[float]
+===== Added
+- Support for AWS S3 {pull}977[#977]
+- Support for AWS SQS {pull}978[#978]
+- Support for AWS SNS {pull}978[#978]
+
 [[release-notes-3.14.0]]
 ==== 3.14.0 (2021-03-17)
 
 [float]
 ===== Added
-- Expanded support for extracting ActiveRecord adapter name from notification payload when using ActiveRecord versions before 6.0 {pull}953[#953]
+
+- Expanded support for extracting ActiveRecord adapter name from notification payload when using
+  ActiveRecord versions before 6.0 {pull}953[#953]
 
 [float]
 ===== Fixed

data/Gemfile

@@ -31,7 +31,9 @@ gem 'webmock'
 
 # Integrations
 gem 'aws-sdk-dynamodb', require: nil
+gem 'aws-sdk-s3', require: nil
 gem 'aws-sdk-sqs', require: nil
+gem 'aws-sdk-sns', require: nil
 gem 'elasticsearch', require: nil
 gem 'fakeredis', require: nil
 gem 'faraday', require: nil

data/lib/elastic_apm/config.rb

@@ -151,11 +151,14 @@ module ElasticAPM
         rake
         redis
         resque
+        s3
         sequel
         shoryuken
         sidekiq
         sinatra
         sneakers
+        sns
+        sqs
         sucker_punch
         tilt
       ]

data/lib/elastic_apm/naively_hashable.rb

@@ -18,6 +18,7 @@
 # frozen_string_literal: true
 
 module ElasticAPM
+  # TODO: Remove this?
   # @api private
   module NaivelyHashable
     def naively_hashable?

data/lib/elastic_apm/normalizers/rails/active_record.rb

@@ -57,12 +57,16 @@ module ElasticAPM
         private
 
         def subtype_for(payload)
-          return cached_adapter_name(payload[:connection].adapter_name) if payload[:connection]
+          if payload[:connection]
+            return cached_adapter_name(payload[:connection].adapter_name)
+          end
 
           if can_attempt_connection_id_lookup?(payload)
             begin
               loaded_object = ObjectSpace._id2ref(payload[:connection_id])
-              return cached_adapter_name(loaded_object.adapter_name) if loaded_object.respond_to?(:adapter_name)
+              if loaded_object.respond_to?(:adapter_name)
+                return cached_adapter_name(loaded_object.adapter_name)
+              end
             rescue RangeError # if connection object has somehow been garbage collected
             end
           end
@@ -84,7 +88,9 @@ module ElasticAPM
         end
 
         def can_attempt_connection_id_lookup?(payload)
-          RUBY_ENGINE == "ruby" && payload[:connection_id] && ObjectSpace.respond_to?(:_id2ref)
+          RUBY_ENGINE == "ruby" &&
+            payload[:connection_id] &&
+            ObjectSpace.respond_to?(:_id2ref)
         end
       end
     end

data/lib/elastic_apm/span/context.rb

@@ -26,7 +26,8 @@ module ElasticAPM
         destination: nil,
         http: nil,
         labels: {},
-        sync: nil
+        sync: nil,
+        message: nil
       )
         @sync = sync
         @db = db && Db.new(**db)
@@ -36,6 +37,11 @@ module ElasticAPM
           when Destination then destination
           when Hash then Destination.new(**destination)
           end
+        @message =
+          case message
+          when Message then message
+          when Hash then Message.new(**message)
+          end
         @labels = labels
       end
 
@@ -44,7 +50,8 @@ module ElasticAPM
         :destination,
         :http,
         :labels,
-        :sync
+        :sync,
+        :message
       )
     end
   end
@@ -53,3 +60,4 @@ end
 require 'elastic_apm/span/context/db'
 require 'elastic_apm/span/context/http'
 require 'elastic_apm/span/context/destination'
+require 'elastic_apm/span/context/message'

data/lib/elastic_apm/span/context/destination.rb

@@ -22,18 +22,30 @@ module ElasticAPM
     class Context
       # @api private
       class Destination
+
+        # @api private
+        class Cloud
+          def initialize(region: nil)
+            @region = region
+          end
+
+          attr_accessor :region
+        end
+
         def initialize(
           name: nil,
           resource: nil,
           type: nil,
           address: nil,
-          port: nil
+          port: nil,
+          cloud: nil
         )
           @name = name
           @resource = resource
           @type = type
           @address = address
           @port = port
+          @cloud = cloud
         end
 
         attr_reader(
@@ -41,7 +53,8 @@ module ElasticAPM
           :resource,
           :type,
           :address,
-          :port
+          :port,
+          :cloud
         )
 
         def self.from_uri(uri_or_str, type: 'external', port: nil)

data/lib/elastic_apm/span/context/message.rb

@@ -0,0 +1,40 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  class Span
+    class Context
+      # @api private
+      class Message
+        def initialize(
+          queue_name: nil,
+          age_ms: nil
+        )
+          @queue_name = queue_name
+          @age_ms = age_ms
+        end
+
+        attr_reader(
+          :queue_name,
+          :age_ms
+        )
+      end
+    end
+  end
+end

data/lib/elastic_apm/spies/dynamo_db.rb

@@ -22,6 +22,11 @@ module ElasticAPM
   module Spies
     # @api private
     class DynamoDBSpy
+      TYPE = 'db'
+      SUBTYPE = 'dynamodb'
+
+      @@formatted_op_names = Concurrent::Map.new
+
       def self.without_net_http
         return yield unless defined?(NetHTTPSpy)
 
@@ -32,6 +37,18 @@ module ElasticAPM
         # rubocop:enable Style/ExplicitBlockArgument
       end
 
+      def self.span_name(operation_name, params)
+        params[:table_name] ?
+          "DynamoDB #{formatted_op_name(operation_name)} #{params[:table_name]}" :
+          "DynamoDB #{formatted_op_name(operation_name)}"
+      end
+
+      def self.formatted_op_name(operation_name)
+        @@formatted_op_names.compute_if_absent(operation_name) do
+          operation_name.to_s.split('_').collect(&:capitalize).join
+        end
+      end
+
       def install
         ::Aws::DynamoDB::Client.class_eval do
           # Alias all available operations
@@ -39,11 +56,27 @@ module ElasticAPM
             alias :"#{operation_name}_without_apm" :"#{operation_name}"
 
             define_method(operation_name) do |params = {}, options = {}|
+              cloud = ElasticAPM::Span::Context::Destination::Cloud.new(region: config.region)
+
+              context = ElasticAPM::Span::Context.new(
+                db: {
+                  instance: config.region,
+                  type: SUBTYPE,
+                  statement: params[:key_condition_expression]
+                },
+                destination: {
+                  cloud: cloud,
+                  resource: SUBTYPE,
+                  type: TYPE
+                }
+              )
+
               ElasticAPM.with_span(
-                operation_name,
-                'db',
-                subtype: 'dynamodb',
-                action: operation_name
+                ElasticAPM::Spies::DynamoDBSpy.span_name(operation_name, params),
+                TYPE,
+                subtype: SUBTYPE,
+                action: operation_name,
+                context: context
               ) do
                 ElasticAPM::Spies::DynamoDBSpy.without_net_http do
                   original_method = method("#{operation_name}_without_apm")

data/lib/elastic_apm/spies/s3.rb

@@ -0,0 +1,127 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  module Spies
+    # @api private
+    class S3Spy
+      TYPE = 'storage'
+      SUBTYPE = 's3'
+      AP_REGION_REGEX = /^(?:[^:]+:){3}([^:]+).*/
+      AP_REGEX = /:accesspoint.*/
+      MUTEX = Mutex.new
+
+      @@formatted_op_names = {}
+
+      def self.without_net_http
+        return yield unless defined?(NetHTTPSpy)
+
+        # rubocop:disable Style/ExplicitBlockArgument
+        ElasticAPM::Spies::NetHTTPSpy.disable_in do
+          yield
+        end
+        # rubocop:enable Style/ExplicitBlockArgument
+      end
+
+      def self.bucket_name(params)
+        if params[:bucket]
+          if index = params[:bucket].rindex(AP_REGEX)
+            params[:bucket][index+1..-1]
+          else
+            params[:bucket]
+          end
+        end
+      end
+
+      def self.accesspoint_region(params)
+        if params[:bucket] && (match = AP_REGION_REGEX.match(params[:bucket]))
+          match[1]
+        end
+      end
+
+      def self.span_name(operation_name, bucket_name)
+        bucket_name ? "S3 #{formatted_op_name(operation_name)} #{bucket_name}" :
+          "S3 #{formatted_op_name(operation_name)}"
+      end
+
+      def self.formatted_op_name(operation_name)
+        if @@formatted_op_names[operation_name]
+          return @@formatted_op_names[operation_name]
+        end
+
+        MUTEX.synchronize do
+          if @@formatted_op_names[operation_name]
+            return @@formatted_op_names[operation_name]
+          end
+
+          @@formatted_op_names[operation_name] =
+            operation_name.to_s.split('_').collect(&:capitalize).join
+        end
+
+        @@formatted_op_names[operation_name]
+      end
+
+
+      def install
+        ::Aws::S3::Client.class_eval do
+          # Alias all available operations
+          api.operation_names.each do |operation_name|
+            alias :"#{operation_name}_without_apm" :"#{operation_name}"
+
+            define_method(operation_name) do |params = {}, options = {}|
+              bucket_name = ElasticAPM::Spies::S3Spy.bucket_name(params)
+              cloud = ElasticAPM::Span::Context::Destination::Cloud.new(
+                region: ElasticAPM::Spies::S3Spy.accesspoint_region(params) || config.region
+              )
+
+              context = ElasticAPM::Span::Context.new(
+                destination: {
+                  cloud: cloud,
+                  resource: bucket_name,
+                  type: TYPE,
+                  name: SUBTYPE
+                }
+              )
+
+              ElasticAPM.with_span(
+                ElasticAPM::Spies::S3Spy.span_name(operation_name, bucket_name),
+                TYPE,
+                subtype: SUBTYPE,
+                action: ElasticAPM::Spies::S3Spy.formatted_op_name(operation_name),
+                context: context
+              ) do
+                ElasticAPM::Spies::S3Spy.without_net_http do
+                  original_method = method("#{operation_name}_without_apm")
+                  original_method.call(params, options)
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(
+      'Aws::S3::Client',
+      'aws-sdk-s3',
+      S3Spy.new
+    )
+  end
+end

data/lib/elastic_apm/spies/sns.rb

@@ -0,0 +1,131 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  module Spies
+    # @api private
+    class SNSSpy
+      TYPE = 'messaging'
+      SUBTYPE = 'sns'
+      AP_REGEX = /:accesspoint[\/:].*/
+      AP_REGION_REGEX = /^(?:[^:]+:){3}([^:]+).*/
+
+      def self.without_net_http
+        return yield unless defined?(NetHTTPSpy)
+
+        # rubocop:disable Style/ExplicitBlockArgument
+        ElasticAPM::Spies::NetHTTPSpy.disable_in do
+          yield
+        end
+        # rubocop:enable Style/ExplicitBlockArgument
+      end
+
+      def self.get_topic(params)
+        return '<PHONE_NUMBER>' if params[:phone_number]
+        
+        last_after_slash_or_colon(
+          params[:topic_arn] || params[:target_arn]
+        )
+      end
+
+      def self.last_after_slash_or_colon(arn)
+        if index = arn.rindex(AP_REGEX)
+          return arn[index+1..-1]
+        end
+
+        if arn.include?('/')
+          arn.split('/')[-1]
+        else
+          arn.split(':')[-1]
+        end
+      end
+
+      def self.arn_region(arn)
+        if arn && (match = AP_REGION_REGEX.match(arn))
+          match[1]
+        end
+      end
+
+      def self.span_context(topic, region)
+        cloud = ElasticAPM::Span::Context::Destination::Cloud.new(region: region)
+
+        ElasticAPM::Span::Context.new(
+          message: {
+            queue_name: topic
+          },
+          destination: {
+            resource: [SUBTYPE, topic].compact.join('/'),
+            type: TYPE,
+            name: SUBTYPE,
+            cloud: cloud
+          }
+        )
+      end
+
+      def install
+        ::Aws::SNS::Client.class_eval do
+          alias :publish_without_apm :publish
+
+          def publish(params = {}, options = {})
+            unless (transaction = ElasticAPM.current_transaction)
+              return publish_without_apm(params, options)
+            end
+
+            topic = ElasticAPM::Spies::SNSSpy.get_topic(params)
+            span_name = topic ? "SNS PUBLISH to #{topic}" : 'SNS PUBLISH'
+            region = ElasticAPM::Spies::SNSSpy.arn_region(
+              params[:topic_arn] || params[:target_arn]
+            )
+            context = ElasticAPM::Spies::SNSSpy.span_context(
+              topic,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'publish',
+              context: context
+            ) do |span|
+              trace_context = span&.trace_context || transaction.trace_context
+              trace_context.apply_headers do |key, value|
+                params[:message_attributes] ||= {}
+                params[:message_attributes][key] ||= {}
+                params[:message_attributes][key][:string_value] = value
+                params[:message_attributes][key][:data_type] = 'String'
+              end
+
+              ElasticAPM::Spies::SNSSpy.without_net_http do
+                publish_without_apm(params, options)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(
+      'Aws::SNS::Client',
+      'aws-sdk-sns',
+      SNSSpy.new
+    )
+  end
+end

data/lib/elastic_apm/spies/sqs.rb

@@ -0,0 +1,240 @@
+# Licensed to Elasticsearch B.V. under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Elasticsearch B.V. licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+# frozen_string_literal: true
+
+module ElasticAPM
+  # @api private
+  module Spies
+    # @api private
+    class SQSSpy
+      TYPE = 'messaging'
+      SUBTYPE = 'sqs'
+
+      REGION_REGEXP = %r{https://sqs\.([a-z0-9-]+)\.amazonaws}
+
+      def self.without_net_http
+        return yield unless defined?(NetHTTPSpy)
+
+        # rubocop:disable Style/ExplicitBlockArgument
+        ElasticAPM::Spies::NetHTTPSpy.disable_in do
+          yield
+        end
+        # rubocop:enable Style/ExplicitBlockArgument
+      end
+
+      def self.queue_name(params)
+        if params[:queue_url]
+          params[:queue_url].split('/')[-1]
+        end
+      end
+
+      def self.region_from_url(url)
+        if match = REGION_REGEXP.match(url)
+          match[1]
+        end
+      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
+          },
+          destination: {
+            resource: [SUBTYPE, queue_name].compact.join('/'),
+            type: TYPE,
+            name: SUBTYPE,
+            cloud: cloud
+          }
+        )
+      end
+
+      def install
+        ::Aws::SQS::Client.class_eval do
+          alias :send_message_without_apm :send_message
+
+          def send_message(params = {}, options = {})
+            unless (transaction = ElasticAPM.current_transaction)
+              return send_message_without_apm(params, options)
+            end
+
+            queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
+            span_name = queue_name ? "SQS SEND to #{queue_name}" : 'SQS SEND'
+            region = ElasticAPM::Spies::SQSSpy.region_from_url(params[:queue_url])
+            context = ElasticAPM::Spies::SQSSpy.span_context(
+              queue_name,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'send',
+              context: context
+            ) do |span|
+              trace_context = span&.trace_context || transaction.trace_context
+              trace_context.apply_headers do |key, value|
+                params[:message_attributes] ||= {}
+                params[:message_attributes][key] ||= {}
+                params[:message_attributes][key][:string_value] = value
+                params[:message_attributes][key][:data_type] = 'String'
+              end
+
+              ElasticAPM::Spies::SQSSpy.without_net_http do
+                send_message_without_apm(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)
+            end
+
+            queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
+            span_name =
+              queue_name ? "SQS SEND_BATCH to #{queue_name}" : 'SQS SEND_BATCH'
+            region = ElasticAPM::Spies::SQSSpy.region_from_url(params[:queue_url])
+            context = ElasticAPM::Spies::SQSSpy.span_context(
+              queue_name,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'send_batch',
+              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] ||= {}
+                  message[:message_attributes][key] ||= {}
+                  message[:message_attributes][key][:string_value] = value
+                  message[:message_attributes][key][:data_type] = 'String'
+                end
+              end
+
+              ElasticAPM::Spies::SQSSpy.without_net_http do
+                send_message_batch_without_apm(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)
+            end
+
+            queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
+            span_name =
+              queue_name ? "SQS RECEIVE from #{queue_name}" : 'SQS RECEIVE'
+            region = ElasticAPM::Spies::SQSSpy.region_from_url(params[:queue_url])
+            context = ElasticAPM::Spies::SQSSpy.span_context(
+              queue_name,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'receive',
+              context: context
+            ) do
+              ElasticAPM::Spies::SQSSpy.without_net_http do
+                receive_message_without_apm(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)
+            end
+
+            queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
+            span_name = queue_name ? "SQS DELETE from #{queue_name}" : 'SQS DELETE'
+            region = ElasticAPM::Spies::SQSSpy.region_from_url(params[:queue_url])
+            context = ElasticAPM::Spies::SQSSpy.span_context(
+              queue_name,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'delete',
+              context: context
+            ) do
+              ElasticAPM::Spies::SQSSpy.without_net_http do
+                delete_message_without_apm(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)
+            end
+
+            queue_name = ElasticAPM::Spies::SQSSpy.queue_name(params)
+            span_name =
+              queue_name ? "SQS DELETE_BATCH from #{queue_name}" : 'SQS DELETE_BATCH'
+            region = ElasticAPM::Spies::SQSSpy.region_from_url(params[:queue_url])
+            context = ElasticAPM::Spies::SQSSpy.span_context(
+              queue_name,
+              region || config.region
+            )
+
+            ElasticAPM.with_span(
+              span_name,
+              TYPE,
+              subtype: SUBTYPE,
+              action: 'delete_batch',
+              context: context
+            ) do
+              ElasticAPM::Spies::SQSSpy.without_net_http do
+                delete_message_batch_without_apm(params, options)
+              end
+            end
+          end
+        end
+      end
+    end
+
+    register(
+      'Aws::SQS::Client',
+      'aws-sdk-sqs',
+      SQSSpy.new
+    )
+  end
+end

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

@@ -65,6 +65,10 @@ module ElasticAPM
               base[:destination] = build_destination(context.destination)
             end
 
+            if context.message
+              base[:message] = build_message(context.message)
+            end
+
             base
           end
 
@@ -89,14 +93,32 @@ module ElasticAPM
           end
 
           def build_destination(destination)
+            base =
+              {
+                service: {
+                  name: keyword_field(destination.name),
+                  resource: keyword_field(destination.resource),
+                  type: keyword_field(destination.type)
+                },
+                address: keyword_field(destination.address),
+                port: destination.port
+              }
+
+            if cloud = destination.cloud
+              base[:cloud] = { region: cloud.region }
+            end
+
+            base
+          end
+
+          def build_message(message)
             {
-              service: {
-                name: keyword_field(destination.name),
-                resource: keyword_field(destination.resource),
-                type: keyword_field(destination.type)
+              queue: {
+                name: keyword_field(message.queue_name)
               },
-              address: keyword_field(destination.address),
-              port: destination.port
+              age: {
+                ms: message.age_ms.to_i
+              }
             }
           end
         end

data/lib/elastic_apm/version.rb

@@ -18,5 +18,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.14.0'
+  VERSION = '3.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.15.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-03-17 00:00:00.000000000 Z
+date: 2021-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -187,6 +187,7 @@ files:
 - lib/elastic_apm/span/context/db.rb
 - lib/elastic_apm/span/context/destination.rb
 - lib/elastic_apm/span/context/http.rb
+- lib/elastic_apm/span/context/message.rb
 - lib/elastic_apm/span_helpers.rb
 - lib/elastic_apm/spies.rb
 - lib/elastic_apm/spies/action_dispatch.rb
@@ -201,11 +202,14 @@ files:
 - lib/elastic_apm/spies/rake.rb
 - lib/elastic_apm/spies/redis.rb
 - lib/elastic_apm/spies/resque.rb
+- lib/elastic_apm/spies/s3.rb
 - lib/elastic_apm/spies/sequel.rb
 - lib/elastic_apm/spies/shoryuken.rb
 - lib/elastic_apm/spies/sidekiq.rb
 - lib/elastic_apm/spies/sinatra.rb
 - lib/elastic_apm/spies/sneakers.rb
+- lib/elastic_apm/spies/sns.rb
+- lib/elastic_apm/spies/sqs.rb
 - lib/elastic_apm/spies/sucker_punch.rb
 - lib/elastic_apm/spies/tilt.rb
 - lib/elastic_apm/sql.rb