elastic-apm 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9c57d8f754de9ab6d024f95f2822b0eae82f17a00cd3edae13d290c9b850393
-  data.tar.gz: 4d32a175d46dac86cabdf97de023a49e7e5eb155a21be11eb227bf61afdb8ffc
+  metadata.gz: 81641cee86d90236fac69836ed6b6e4e858e0650d099c7cf0ab2fbc58e9d8550
+  data.tar.gz: a8f13b6c5b4b430c4cba21f92167b784634bc151ef802472e9a4fc1af6f95c1b
 SHA512:
-  metadata.gz: '09cddb89d0d5265c7c12e8838702cde336754e197d8f4e6647f3885ccde3f6fc806f91b22ab054cf8c5c465373e34bf0f46580a2ab01513da5246d9ea443bb2c'
-  data.tar.gz: 10732912f09d131204363dd0191e59f689d9560935af8df0b195cd4a145e9402c4a5f3cc3ed136399471f1a406efd7202a7d8384772bc6356b4a64752333cd03
+  metadata.gz: 3db0a577687ac11af79c29de68c3935cb0df9572bed2583c5d9666dd15aefabb97a0ab0a081b79fd41ee7e53e1e3319700d0ebd74a30883eaa55b45684ea9862
+  data.tar.gz: a191284ee54fd8be1511927ff1af81f13bb129c6f282d2078099cf8a79fe124ec5f995243260d66a23920f6d82fdb1955614cdbe260b58413bb9863ee0226a3a

data/CHANGELOG.asciidoc

@@ -35,6 +35,21 @@ endif::[]
 [[release-notes-4.x]]
 === Ruby Agent version 4.x
 
+[[release-notes-4.2.0]]
+==== 4.2.0
+
+[float]
+===== Added
+
+- Add support for AWS Storage Table/CosmosDB {pull}999[#999]
+
+[float]
+===== Fixed
+
+- Align HTTP span types/subtypes with spec {pull}1014[#1014]
+- Passing a full URL as a path to `Net::HTTP` {pull}1029[#1029]
+- Fix growing number of open file descriptors {pull}1033[#1033]
+
 [[release-notes-4.1.0]]
 ==== 4.1.0
 

data/Gemfile

@@ -36,6 +36,7 @@ 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 'azure-storage-table', require: nil if RUBY_VERSION < '3.0'
 gem 'elasticsearch', require: nil
 gem 'fakeredis', require: nil
 gem 'faraday', require: nil

data/SECURITY.md

@@ -0,0 +1,7 @@
+# Security Policy
+
+Thanks for your interest in the security of our products.
+Our security policy can be found at [https://www.elastic.co/community/security](https://www.elastic.co/community/security).
+
+## Reporting a Vulnerability
+Please send security vulnerability reports to security@elastic.co.

data/docker-compose.yml

@@ -11,7 +11,7 @@ services:
     build:
       context: .
       args:
-        BUNDLER_VERSION: '2.0.2'
+        BUNDLER_VERSION: '2.2.21'
     image: '$IMAGE_NAME'
     environment:
       HOME: '/tmp'

data/lib/elastic_apm.rb

@@ -32,6 +32,7 @@ require 'elastic_apm/internal_error'
 require 'elastic_apm/logging'
 
 # Core
+require 'elastic_apm/fields'
 require 'elastic_apm/agent'
 require 'elastic_apm/config'
 require 'elastic_apm/context'

data/lib/elastic_apm/agent.rb

@@ -280,8 +280,8 @@ module ElasticAPM
     def detect_forking!
       return if @pid == Process.pid
 
-      config.logger.debug "Forked process detected,
-        restarting threads in process [PID:#{Process.pid}]"
+      config.logger.debug(
+        "Forked process detected, restarting threads in process [PID:#{Process.pid}]")
 
       central_config.handle_forking!
       transport.handle_forking!

data/lib/elastic_apm/central_config.rb

@@ -119,7 +119,7 @@ module ElasticAPM
       end
 
       if resp.status == 304
-        info 'Received 304 Not Modified'
+        debug 'Received 304 Not Modified'
       else
         if resp.body && !resp.body.empty?
           update = JSON.parse(resp.body.to_s)
@@ -169,7 +169,7 @@ module ElasticAPM
     end
 
     def headers
-      { 'Etag': @etag }
+      { 'If-None-Match': @etag }
     end
 
     def schedule_next_fetch(resp = nil)

data/lib/elastic_apm/config.rb

@@ -133,6 +133,7 @@ module ElasticAPM
     def available_instrumentations
       %w[
         action_dispatch
+        azure_storage_table
         delayed_job
         dynamo_db
         elasticsearch

data/lib/elastic_apm/fields.rb

@@ -0,0 +1,88 @@
+# 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
+  # An interface for creating simple, value holding objects that correspond to
+  # object fields in the API.
+  #
+  # Example:
+  #   class MyThing
+  #     include Fields
+  #     field :name
+  #     field :address, optional: true
+  #   end
+  #
+  #   MyThing.new(name: 'AJ').to_h
+  #     # => { name: 'AJ' }
+  #   MyThing.new().empty?
+  #     # => true
+  module Fields
+    module InstanceMethods
+      def initialize(**attrs)
+        attrs.each do |key, value|
+          self.send(:"#{key}=", value)
+        end
+
+        super()
+      end
+
+      def empty?
+        self.class.fields.each do |key|
+          next if send(key)
+          next if optionals.include?(key)
+
+          return true
+        end
+
+        false
+      end
+
+      def to_h
+        self.class.fields.each_with_object({}) do |key, fields|
+          fields[key] = send(key)
+        end
+      end
+
+      private
+
+      def optionals
+        self.class.optionals
+      end
+    end
+
+    module ClassMethods
+      def field(key, optional: false)
+        attr_accessor(key)
+
+        fields.push(key)
+        optionals.push(key) if optional
+      end
+
+      attr_reader :fields, :optionals
+    end
+
+    def self.included(cls)
+      cls.extend(ClassMethods)
+      cls.include(InstanceMethods)
+
+      cls.instance_variable_set(:@fields, [])
+      cls.instance_variable_set(:@optionals, [])
+    end
+  end
+end

data/lib/elastic_apm/span.rb

@@ -106,6 +106,18 @@ module ElasticAPM
       @duration ||= (clock_end - @clock_start)
       @parent.child_stopped
       @self_time = @duration - child_durations.duration
+
+      if exit_span?
+        context.destination ||= Context::Destination.new
+        context.destination.service ||= Context::Destination::Service.new
+        context.destination.service.resource ||= (subtype || type)
+
+        # Deprecated fields but required by some versions of APM Server, so
+        # we auto-infer them from existing fields
+        context.destination.service.name ||= (subtype || type)
+        context.destination.service.type ||= type
+      end
+
       self
     end
 
@@ -144,6 +156,8 @@ module ElasticAPM
       "<ElasticAPM::Span id:#{trace_context&.id}" \
         " name:#{name.inspect}" \
         " type:#{type.inspect}" \
+        " subtype:#{subtype.inspect}" \
+        " action:#{action.inspect}" \
         '>'
     end
 
@@ -166,5 +180,9 @@ module ElasticAPM
 
       duration >= min_duration
     end
+
+    def exit_span?
+      context.destination || context.db || context.message || context.http
+    end
   end
 end

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

@@ -14,7 +14,7 @@
 # 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
@@ -22,74 +22,53 @@ module ElasticAPM
     class Context
       # @api private
       class Destination
+        include Fields
+
+        field :address
+        field :port
+        field :service
+        field :cloud
 
         # @api private
         class Service
-          class MissingValues < StandardError; end
-
-          def initialize(name: nil, type: nil, resource: nil)
-            @name = name
-            @type = type
-            @resource = resource
+          include Fields
 
-            # APM Server expects all values for service
-            raise MissingValues unless @name && @type && resource
-          end
-
-          attr_accessor :name, :type, :resource
+          field :name
+          field :type
+          field :resource
         end
 
         # @api private
         class Cloud
-          def initialize(region: nil)
-            @region = region
-          end
+          include Fields
 
-          attr_accessor :region
+          field :region
         end
 
-        def initialize(
-          address: nil,
-          port: nil,
-          service: nil,
-          cloud: nil
-        )
-          @address = address
-          @port = port
-          @service = build_service(service)
-          @cloud = build_cloud(cloud)
-        end
+        def initialize(service: nil, cloud: nil, **attrs)
+          super(**attrs)
 
-        attr_reader(
-          :address,
-          :port,
-          :service,
-          :cloud
-        )
+          self.service = build_service(service)
+          self.cloud = build_cloud(cloud)
+        end
 
-        def self.from_uri(uri_or_str, type: 'external', port: nil)
+        def self.from_uri(uri_or_str, type: nil, **attrs)
           uri = normalize(uri_or_str)
 
-          service = Service.new(
-            name: only_scheme_and_host(uri),
-            resource: "#{uri.host}:#{uri.port}",
-            type: type
-          )
+          service =
+            case type
+            when 'http' then http_service(uri)
+            else nil
+            end
 
           new(
             address: uri.hostname,
-            port: port || uri.port,
-            service: service
+            port: uri.port,
+            service: service,
+            **attrs
           )
         end
 
-        def self.only_scheme_and_host(uri_or_str)
-          uri = normalize(uri_or_str)
-          uri.path = ''
-          uri.password = uri.query = uri.fragment = nil
-          uri.to_s
-        end
-
         class << self
           private
 
@@ -97,25 +76,27 @@ module ElasticAPM
             return uri_or_str.dup if uri_or_str.is_a?(URI)
             URI(uri_or_str)
           end
+
+          def http_service(uri)
+            Service.new(resource: "#{uri.host}:#{uri.port}")
+          end
         end
 
         private
 
-        def build_service(service = nil)
-          return unless service
-          return service if service.is_a?(Service)
-
-          Service.new(**service)
-        rescue Service::MissingValues
-          nil # If we are missing any service value, return nothing
-        end
-
         def build_cloud(cloud = nil)
-          return unless cloud
+          return Cloud.new unless cloud
           return cloud if cloud.is_a?(Cloud)
 
           Cloud.new(**cloud)
         end
+
+        def build_service(service = nil)
+          return Service.new unless service
+          return service if service.is_a?(Service)
+
+          Service.new(**service)
+        end
       end
     end
   end

data/lib/elastic_apm/spies.rb

@@ -56,6 +56,26 @@ module ElasticAPM
       end
     end
 
+    def self.without_faraday
+      return yield unless defined?(FaradaySpy)
+
+      # rubocop:disable Style/ExplicitBlockArgument
+      ElasticAPM::Spies::FaradaySpy.disable_in do
+        yield
+      end
+      # rubocop:enable Style/ExplicitBlockArgument
+    end
+
+    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.register_require_hook(registration)
       registration.require_paths.each do |path|
         require_hooks[path] = registration

data/lib/elastic_apm/spies/azure_storage_table.rb

@@ -0,0 +1,148 @@
+# 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 AzureStorageTableSpy
+      TYPE = "storage"
+      SUBTYPE = "azuretable"
+
+      module Helpers
+        class << self
+          def instrument(operation_name, table_name = nil, service:)
+            span_name = span_name(operation_name, table_name)
+            action = formatted_op_name(operation_name)
+            account_name = account_name_from_storage_table_host(service.storage_service_host[:primary])
+
+            destination = ElasticAPM::Span::Context::Destination.from_uri(service.storage_service_host[:primary])
+            destination.service.resource = "#{SUBTYPE}/#{account_name}"
+
+            context = ElasticAPM::Span::Context.new(destination: destination)
+
+            ElasticAPM.with_span(span_name, TYPE, subtype: SUBTYPE, action: action, context: context) do
+              ElasticAPM::Spies.without_faraday do
+                ElasticAPM::Spies.without_net_http do
+                  yield
+                end
+              end
+            end
+          end
+
+          private
+
+          DEFAULT_OP_NAMES = {
+            "create_table" => "Create",
+            "delete_table" => "Delete",
+            "get_table_acl" => "GetAcl",
+            "set_table_acl" => "SetAcl",
+            "insert_entity" => "Insert",
+            "query_entities" => "Query",
+            "update_entity" => "Update",
+            "merge_entity" => "Merge",
+            "delete_entity" => "Delete"
+          }.freeze
+
+          def formatted_op_names
+            @formatted_op_names ||= Concurrent::Map.new
+          end
+
+          def account_names
+            @account_names ||= Concurrent::Map.new
+          end
+
+          def span_name(operation_name, table_name = nil)
+            base = "AzureTable #{formatted_op_name(operation_name)}"
+
+            return base unless table_name
+
+            "#{base} #{table_name}"
+          end
+
+          def formatted_op_name(operation_name)
+            formatted_op_names.compute_if_absent(operation_name) do
+              DEFAULT_OP_NAMES.fetch(operation_name) do
+                operation_name.to_s.split("_").collect(&:capitalize).join
+              end
+            end
+          end
+
+          def account_name_from_storage_table_host(host)
+            account_names.compute_if_absent(host) do
+              URI(host).host.split(".").first || "unknown"
+            end
+          rescue Exception
+            "unknown"
+          end
+        end
+      end
+
+      # @api private
+      module Ext
+        # Methods with table_name as first parameter
+        %i[
+          create_table
+          delete_table
+          get_table
+          get_table_acl
+          set_table_acl
+          insert_entity
+          query_entities
+          update_entity
+          merge_entity
+          delete_entity
+        ].each do |method_name|
+          define_method(method_name) do |table_name, *args|
+            unless (transaction = ElasticAPM.current_transaction)
+              return super(table_name, *args)
+            end
+
+            ElasticAPM::Spies::AzureStorageTableSpy::Helpers.instrument(
+              method_name.to_s, table_name, service: self
+            ) do
+              super(table_name, *args)
+            end
+          end
+        end
+
+        # Methods WITHOUT table_name as first parameter
+        def query_tables(*args)
+          unless (transaction = ElasticAPM.current_transaction)
+            return super(*args)
+          end
+
+          ElasticAPM::Spies::AzureStorageTableSpy::Helpers.instrument("query_tables", service: self) do
+            super(*args)
+          end
+        end
+      end
+
+      def install
+        ::Azure::Storage::Table::TableService.prepend(Ext)
+      end
+    end
+
+    register(
+      "Azure::Storage::Table::TableService",
+      "azure/storage/table",
+      AzureStorageTableSpy.new
+    )
+  end
+end

data/lib/elastic_apm/spies/dynamo_db.rb

@@ -56,8 +56,6 @@ module ElasticAPM
           # Alias all available operations
           mod.api.operation_names.each do |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,
@@ -65,12 +63,8 @@ module ElasticAPM
                   statement: params[:key_condition_expression]
                 },
                 destination: {
-                  cloud: cloud,
-                  service: {
-                    name: NAME,
-                    resource: SUBTYPE,
-                    type: TYPE
-                  }
+                  service: { resource: "#{SUBTYPE}/#{config.region}" },
+                  cloud: { region: config.region }
                 }
               )
 

data/lib/elastic_apm/spies/faraday.rb

@@ -22,17 +22,28 @@ module ElasticAPM
   module Spies
     # @api private
     class FaradaySpy
-      TYPE = 'ext'
-      SUBTYPE = 'faraday'
+      DISABLE_KEY = :__elastic_apm_faraday_disabled
+      TYPE = 'external'
+      SUBTYPE = 'http'
 
-      def self.without_net_http
-        return yield unless defined?(NetHTTPSpy)
+      class << self
+        def disabled=(disabled)
+          Thread.current[DISABLE_KEY] = disabled
+        end
+
+        def disabled?
+          Thread.current[DISABLE_KEY] ||= false
+        end
+
+        def disable_in
+          self.disabled = true
 
-        # rubocop:disable Style/ExplicitBlockArgument
-        ElasticAPM::Spies::NetHTTPSpy.disable_in do
-          yield
+          begin
+            yield
+          ensure
+            self.disabled = false
+          end
         end
-        # rubocop:enable Style/ExplicitBlockArgument
       end
 
       # @api private
@@ -43,6 +54,10 @@ module ElasticAPM
             return super(method, url, body, headers, &block)
           end
 
+          if ElasticAPM::Spies::FaradaySpy.disabled?
+            return super(method, url, body, headers, &block)
+          end
+
           uri = URI(build_url(url))
 
           # If url is set inside block it isn't available until yield,
@@ -61,7 +76,7 @@ module ElasticAPM
           upcased_method = method.to_s.upcase
 
           if uri
-            destination = ElasticAPM::Span::Context::Destination.from_uri(uri)
+            destination = ElasticAPM::Span::Context::Destination.from_uri(uri, type: SUBTYPE)
 
             context =
               ElasticAPM::Span::Context.new(
@@ -83,10 +98,9 @@ module ElasticAPM
             "#{upcased_method} #{host}",
             TYPE,
             subtype: SUBTYPE,
-            action: upcased_method,
             context: context
           ) do |span|
-            ElasticAPM::Spies::FaradaySpy.without_net_http do
+            ElasticAPM::Spies.without_net_http do
               trace_context = span&.trace_context || transaction.trace_context
 
               result = super(method, url, body, headers) do |req|

data/lib/elastic_apm/spies/http.rb

@@ -22,8 +22,8 @@ module ElasticAPM
   module Spies
     # @api private
     class HTTPSpy
-      TYPE = 'ext'
-      SUBTYPE = 'http_rb'
+      TYPE = 'external'
+      SUBTYPE = 'http'
 
       # @api private
       module Ext
@@ -37,7 +37,7 @@ module ElasticAPM
 
           context = ElasticAPM::Span::Context.new(
             http: { url: req.uri, method: method },
-            destination: ElasticAPM::Span::Context::Destination.from_uri(req.uri)
+            destination: ElasticAPM::Span::Context::Destination.from_uri(req.uri, type: SUBTYPE)
           )
 
           name = "#{method} #{host}"
@@ -46,7 +46,6 @@ module ElasticAPM
             name,
             TYPE,
             subtype: SUBTYPE,
-            action: method,
             context: context
           ) do |span|
             trace_context = span&.trace_context || transaction.trace_context

data/lib/elastic_apm/spies/net_http.rb

@@ -22,17 +22,17 @@ module ElasticAPM
   module Spies
     # @api private
     class NetHTTPSpy
-      KEY = :__elastic_apm_net_http_disabled
-      TYPE = 'ext'
-      SUBTYPE = 'net_http'
+      DISABLE_KEY = :__elastic_apm_net_http_disabled
+      TYPE = 'external'
+      SUBTYPE = 'http'
 
       class << self
         def disabled=(disabled)
-          Thread.current[KEY] = disabled
+          Thread.current[DISABLE_KEY] = disabled
         end
 
         def disabled?
-          Thread.current[KEY] ||= false
+          Thread.current[DISABLE_KEY] ||= false
         end
 
         def disable_in
@@ -60,26 +60,33 @@ module ElasticAPM
 
           host = req['host']&.split(':')&.first || address || 'localhost'
           method = req.method.to_s.upcase
-          path, query = req.path.split('?')
 
-          url = use_ssl? ? +'https://' : +'http://'
-          url << host
-          url << ":#{port}" if port
-          url << path
-          url << "?#{query}" if query
-          uri = URI(url)
+          uri_or_path = URI(req.path)
+
+          # Support the case where a whole url is passed as a path to a nil host
+          uri =
+            if uri_or_path.host
+              uri_or_path
+            else
+              path, query = req.path.split('?')
+              url = use_ssl? ? +'https://' : +'http://'
+              url << host
+              url << ":#{port}" if port
+              url << path
+              url << "?#{query}" if query
+              URI(url)
+            end
 
           context =
             ElasticAPM::Span::Context.new(
               http: { url: uri, method: method },
-              destination: ElasticAPM::Span::Context::Destination.from_uri(uri)
+              destination: ElasticAPM::Span::Context::Destination.from_uri(uri, type: SUBTYPE)
             )
 
           ElasticAPM.with_span(
             "#{method} #{host}",
             TYPE,
             subtype: SUBTYPE,
-            action: method,
             context: context
           ) do |span|
             trace_context = span&.trace_context || transaction.trace_context

data/lib/elastic_apm/spies/s3.rb

@@ -14,7 +14,7 @@
 # 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
@@ -85,14 +85,11 @@ module ElasticAPM
               bucket_name = ElasticAPM::Spies::S3Spy.bucket_name(params)
               region = ElasticAPM::Spies::S3Spy.accesspoint_region(params) || config.region
 
+              resource = "#{SUBTYPE}/#{bucket_name || 'unknown-bucket'}"
               context = ElasticAPM::Span::Context.new(
                 destination: {
-                  cloud: { region: region },
-                  service: {
-                    resource: bucket_name,
-                    type: TYPE,
-                    name: SUBTYPE
-                  }
+                  service: { resource: resource },
+                  cloud: { region: region }
                 }
               )
 

data/lib/elastic_apm/spies/sequel.rb

@@ -46,7 +46,7 @@ module ElasticAPM
 
           context = ElasticAPM::Span::Context.new(
             db: { statement: sql, type: 'sql', user: opts[:user] },
-            destination: { service: { name: subtype, resource: subtype, type: TYPE } }
+            destination: { service: { resource: subtype } }
           )
 
           span = ElasticAPM.start_span(

data/lib/elastic_apm/spies/sns.rb

@@ -65,16 +65,10 @@ module ElasticAPM
 
       def self.span_context(topic, region)
         ElasticAPM::Span::Context.new(
-          message: {
-            queue_name: topic
-          },
+          message: { queue_name: topic },
           destination: {
-            service: {
-              resource: [SUBTYPE, topic].compact.join('/'),
-              type: TYPE,
-              name: SUBTYPE,
-            },
-            cloud: ElasticAPM::Span::Context::Destination::Cloud.new(region: region)
+            service: { resource: "#{SUBTYPE}/#{topic}" },
+            cloud: { region: region }
           }
         )
       end

data/lib/elastic_apm/spies/sqs.rb

@@ -50,19 +50,11 @@ 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: {
-            service: {
-              resource: [SUBTYPE, queue_name].compact.join('/'),
-              type: TYPE,
-              name: SUBTYPE
-            },
-            cloud: cloud
+            service: { resource: "#{SUBTYPE}/#{queue_name}" },
+            cloud: { region: region }
           }
         )
       end

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/transport/connection/http.rb

@@ -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/serializers/span_serializer.rb

@@ -100,16 +100,12 @@ module ElasticAPM
               port: destination.port
             }
 
-            if service = destination.service
-              base[:service] = {
-                name: keyword_field(destination.service.name),
-                resource: keyword_field(destination.service.resource),
-                type: keyword_field(destination.service.type)
-              }
+            unless destination.service&.empty?
+              base[:service] = destination.service.to_h
             end
 
-            if cloud = destination.cloud
-              base[:cloud] = { region: cloud.region }
+            unless destination.cloud&.empty?
+              base[:cloud] = destination.cloud.to_h
             end
 
             base

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-27 00:00:00.000000000 Z
+date: 2021-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -38,7 +38,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '3.0'
-description:
+description: 
 email:
 - mikkel@elastic.co
 executables: []
@@ -85,6 +85,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - bench/.gitignore
 - bench/app.rb
 - bench/benchmark.rb
@@ -148,6 +149,7 @@ files:
 - lib/elastic_apm/error/exception.rb
 - lib/elastic_apm/error/log.rb
 - lib/elastic_apm/error_builder.rb
+- lib/elastic_apm/fields.rb
 - lib/elastic_apm/grape.rb
 - lib/elastic_apm/graphql.rb
 - lib/elastic_apm/grpc.rb
@@ -193,6 +195,7 @@ files:
 - lib/elastic_apm/span_helpers.rb
 - lib/elastic_apm/spies.rb
 - lib/elastic_apm/spies/action_dispatch.rb
+- lib/elastic_apm/spies/azure_storage_table.rb
 - lib/elastic_apm/spies/delayed_job.rb
 - lib/elastic_apm/spies/dynamo_db.rb
 - lib/elastic_apm/spies/elasticsearch.rb
@@ -254,7 +257,7 @@ licenses:
 - Apache-2.0
 metadata:
   source_code_uri: https://github.com/elastic/apm-agent-ruby
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -269,8 +272,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby
 test_files: []