elastic-apm 3.15.1 → 4.2.0

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

@@ -46,8 +46,8 @@ module ElasticAPM
         private
 
         def build_samples(samples)
-          samples.each_with_object({}) do |(key, value), hsh|
-            hsh[key] = { value: value }
+          samples.transform_values do |value|
+            { value: value }
           end
         end
       end

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

@@ -93,19 +93,19 @@ 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
-              }
+            return unless destination
+
+            base = {
+              address: keyword_field(destination.address),
+              port: destination.port
+            }
+
+            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/transport/user_agent.rb

@@ -21,7 +21,8 @@ module ElasticAPM
   module Transport
     # @api private
     class UserAgent
-      def initialize(config)
+      def initialize(config, version: VERSION)
+        @version = version
         @built = build(config)
       end
 
@@ -35,7 +36,7 @@ module ElasticAPM
         service = Metadata::ServiceInfo.new(config)
 
         [
-          "elastic-apm-ruby/#{VERSION}",
+          "elastic-apm-ruby/#{@version}",
           HTTP::Request::USER_AGENT,
           [
             service.runtime.name,

data/lib/elastic_apm/transport/worker.rb

@@ -58,7 +58,7 @@ module ElasticAPM
         while (msg = queue.pop)
           case msg
           when StopMessage
-            debug 'Stopping worker -- %s', self
+            debug 'Stopping worker [%s]', self
             connection.flush(:halt)
             break
           else

data/lib/elastic_apm/util/deep_dup.rb

@@ -48,7 +48,7 @@ module ElasticAPM
       end
 
       def array(arr)
-        arr.map(&method(:deep_dup))
+        arr.map { |obj| deep_dup(obj) }
       end
 
       def hash(hsh)

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.15.1
+  version: 4.2.0
 platform: ruby
 authors:
 - Mikkel Malmberg
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-06 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: []
@@ -69,6 +69,7 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/dependabot.yml"
 - ".github/labeler-config.yml"
 - ".github/workflows/addToProject.yml"
 - ".github/workflows/labeler.yml"
@@ -84,6 +85,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- SECURITY.md
 - bench/.gitignore
 - bench/app.rb
 - bench/benchmark.rb
@@ -95,6 +97,7 @@ files:
 - bin/build_docs
 - bin/console
 - bin/dev
+- bin/run-bdd
 - bin/run-tests
 - bin/setup
 - bin/with_framework
@@ -146,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
@@ -191,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
@@ -212,11 +217,9 @@ files:
 - lib/elastic_apm/spies/sqs.rb
 - lib/elastic_apm/spies/sucker_punch.rb
 - lib/elastic_apm/spies/tilt.rb
-- lib/elastic_apm/sql.rb
 - lib/elastic_apm/sql/signature.rb
 - lib/elastic_apm/sql/tokenizer.rb
 - lib/elastic_apm/sql/tokens.rb
-- lib/elastic_apm/sql_summarizer.rb
 - lib/elastic_apm/stacktrace.rb
 - lib/elastic_apm/stacktrace/frame.rb
 - lib/elastic_apm/stacktrace_builder.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: []

data/lib/elastic_apm/sql.rb

@@ -1,36 +0,0 @@
-# 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 Sql
-    # This method is only here as a shortcut while the agent ships with
-    # both implementations ~mikker
-    def self.summarizer
-      @summarizer ||=
-        if ElasticAPM.agent&.config&.use_legacy_sql_parser
-          require 'elastic_apm/sql_summarizer'
-          SqlSummarizer.new
-        else
-          require 'elastic_apm/sql/signature'
-          Sql::Signature::Summarizer.new
-        end
-    end
-  end
-end

data/lib/elastic_apm/sql_summarizer.rb

@@ -1,53 +0,0 @@
-# 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
-
-require 'elastic_apm/util/lru_cache'
-
-module ElasticAPM
-  # @api private
-  class SqlSummarizer
-    DEFAULT = 'SQL'
-    TABLE_REGEX = %{["'`]?([A-Za-z0-9_]+)["'`]?}
-
-    REGEXES = {
-      /^BEGIN/iu => 'BEGIN',
-      /^COMMIT/iu => 'COMMIT',
-      /^SELECT .* FROM #{TABLE_REGEX}/iu => 'SELECT FROM ',
-      /^INSERT INTO #{TABLE_REGEX}/iu => 'INSERT INTO ',
-      /^UPDATE #{TABLE_REGEX}/iu => 'UPDATE ',
-      /^DELETE FROM #{TABLE_REGEX}/iu => 'DELETE FROM '
-    }.freeze
-
-    FORMAT = '%s%s'
-
-    def self.cache
-      @cache ||= Util::LruCache.new
-    end
-
-    def summarize(sql)
-      sql = sql.encode('utf-8', invalid: :replace, undef: :replace)
-      self.class.cache[sql] ||=
-        REGEXES.find do |regex, sig|
-          if (match = sql[0...1000].match(regex))
-            break format(FORMAT, sig, match[1] && match[1].gsub(/["']/, ''))
-          end
-        end || DEFAULT
-    end
-  end
-end