elastic-apm 3.11.0 → 3.14.0

data/lib/elastic_apm/transport/connection.rb

@@ -42,7 +42,7 @@ module ElasticAPM
             Metadata.new(config)
           )
         )
-        @url = config.server_url + '/intake/v2/events'
+        @url = "#{config.server_url}/intake/v2/events"
         @mutex = Mutex.new
       end
 

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

@@ -17,9 +17,12 @@
 
 # frozen_string_literal: true
 
+require 'elastic_apm/util/deep_dup'
+
 module ElasticAPM
   module Transport
     module Filters
+      # @api private
       class HashSanitizer
         FILTERED = '[FILTERED]'
 
@@ -38,8 +41,12 @@ module ElasticAPM
 
         attr_accessor :key_patterns
 
+        def strip_from(obj)
+          strip_from!(Util::DeepDup.dup(obj))
+        end
+
         def strip_from!(obj)
-          return unless obj&.is_a?(Hash)
+          return unless obj.is_a?(Hash)
 
           obj.each do |k, v|
             if filter_key?(k)

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

@@ -28,20 +28,42 @@ module ElasticAPM
           @config = config
           @sanitizer =
             HashSanitizer.new(
-              key_patterns: config.custom_key_filters + config.sanitize_field_names
+              key_patterns: config.custom_key_filters +
+                            config.sanitize_field_names
             )
         end
 
         def call(payload)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :body)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :cookies)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :env)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :request, :headers)
-          @sanitizer.strip_from! payload.dig(:transaction, :context, :response, :headers)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :cookies)
-          @sanitizer.strip_from! payload.dig(:error, :context, :request, :headers)
-          @sanitizer.strip_from! payload.dig(:error, :context, :response, :headers)
-
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :body)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :cookies)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :env)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :request, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:transaction, :context, :response, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :body)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :cookies)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :env)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :request, :headers)
+          )
+          @sanitizer.strip_from!(
+            payload.dig(:error, :context, :response, :headers)
+          )
           payload
         end
       end

data/lib/elastic_apm/transport/serializers.rb

@@ -74,6 +74,7 @@ module ElasticAPM
         end
 
         attr_reader :transaction, :span, :error, :metadata, :metricset
+
         def serialize(resource)
           case resource
           when Transaction

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

@@ -31,7 +31,7 @@ module ElasticAPM
               labels: build_labels(metadata.labels)
             }
 
-          if (metadata.cloud.provider)
+          if metadata.cloud.provider
             base[:cloud] = build_cloud(metadata.cloud)
           end
 
@@ -64,7 +64,7 @@ module ElasticAPM
               }
             }
 
-          if node_name = service.node_name
+          if (node_name = service.node_name)
             base[:node] = { name: keyword_field(node_name) }
           end
 
@@ -84,34 +84,49 @@ module ElasticAPM
             hostname: keyword_field(system.hostname),
             architecture: keyword_field(system.architecture),
             platform: keyword_field(system.platform),
-            kubernetes: keyword_object(system.kubernetes)
+            kubernetes: keyword_object(system.kubernetes),
+            container: keyword_object(system.container)
           }
         end
 
         def build_cloud(cloud)
-          {
+          strip_nulls!(
             provider: cloud.provider,
             account: {
               id: keyword_field(cloud.account_id),
-              name: keyword_field(cloud.account_name),
+              name: keyword_field(cloud.account_name)
             },
             availability_zone: keyword_field(cloud.availability_zone),
             instance: {
               id: keyword_field(cloud.instance_id),
-              name: keyword_field(cloud.instance_name),
+              name: keyword_field(cloud.instance_name)
             },
             machine: { type: keyword_field(cloud.machine_type) },
             project: {
               id: keyword_field(cloud.project_id),
-              name: keyword_field(cloud.project_name),
+              name: keyword_field(cloud.project_name)
             },
             region: keyword_field(cloud.region)
-          }
+          )
         end
 
         def build_labels(labels)
           keyword_object(labels)
         end
+
+        # A bug in APM Server 7.9 disallows null values in `cloud`
+        def strip_nulls!(hash)
+          hash.each_key do |key|
+            case value = hash[key]
+            when Hash
+              strip_nulls!(value)
+              hash.delete(key) if value.empty?
+            when nil then hash.delete(key)
+            end
+          end
+
+          hash
+        end
       end
     end
   end

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

@@ -43,14 +43,14 @@ module ElasticAPM
               stacktrace: span.stacktrace.to_a,
               timestamp: span.timestamp,
               trace_id: span.trace_id,
-              sample_rate: span.sample_rate
+              sample_rate: span.sample_rate,
+              outcome: keyword_field(span.outcome)
             }
           }
         end
 
         # @api private
         class ContextSerializer < Serializer
-          # rubocop:disable Metrics/CyclomaticComplexity
           def build(context)
             return unless context
 
@@ -67,7 +67,6 @@ module ElasticAPM
 
             base
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           private
 

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

@@ -35,6 +35,7 @@ module ElasticAPM
               name: keyword_field(transaction.name),
               type: keyword_field(transaction.type),
               result: keyword_field(transaction.result.to_s),
+              outcome: keyword_field(transaction.outcome),
               duration: ms(transaction.duration),
               timestamp: transaction.timestamp,
               sampled: transaction.sampled?,

data/lib/elastic_apm/util/deep_dup.rb

@@ -0,0 +1,65 @@
+# 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
+  module Util
+    # @api private
+    #
+    # Makes a deep copy of an Array or Hash
+    # NB: Not guaranteed to work well with complex objects, only simple Hash,
+    # Array, String, Number, etc.
+    class DeepDup
+      def initialize(obj)
+        @obj = obj
+      end
+
+      def dup
+        deep_dup(@obj)
+      end
+
+      def self.dup(obj)
+        new(obj).dup
+      end
+
+      private
+
+      def deep_dup(obj)
+        case obj
+        when Hash then hash(obj)
+        when Array then array(obj)
+        else obj.dup
+        end
+      end
+
+      def array(arr)
+        arr.map(&method(:deep_dup))
+      end
+
+      def hash(hsh)
+        result = hsh.dup
+
+        hsh.each_pair do |key, value|
+          result[key] = deep_dup(value)
+        end
+
+        result
+      end
+    end
+  end
+end

data/lib/elastic_apm/util/precision_validator.rb

@@ -24,7 +24,7 @@ module ElasticAPM
     # If `minimum` is provided, and the value rounds to 0 (but was not zero to
     # begin with), use the minimum instead.
     module PrecisionValidator
-      extend self
+      module_function
 
       def validate(value, precision: 0, minimum: nil)
         float = Float(value)

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.11.0
+  version: 3.14.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-27 00:00:00.000000000 Z
+date: 2021-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -69,6 +69,9 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/labeler-config.yml"
+- ".github/workflows/addToProject.yml"
+- ".github/workflows/labeler.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -126,6 +129,7 @@ files:
 - lib/elastic_apm/config.rb
 - lib/elastic_apm/config/bytes.rb
 - lib/elastic_apm/config/duration.rb
+- lib/elastic_apm/config/log_level_map.rb
 - lib/elastic_apm/config/options.rb
 - lib/elastic_apm/config/regexp_list.rb
 - lib/elastic_apm/config/round_float.rb
@@ -235,6 +239,7 @@ files:
 - lib/elastic_apm/transport/user_agent.rb
 - lib/elastic_apm/transport/worker.rb
 - lib/elastic_apm/util.rb
+- lib/elastic_apm/util/deep_dup.rb
 - lib/elastic_apm/util/inflector.rb
 - lib/elastic_apm/util/lru_cache.rb
 - lib/elastic_apm/util/precision_validator.rb