elastic-apm 3.12.0 → 3.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c810b4e9b4f1149873235af4d1ddd6b4a85acf7734c491a42d21777443d57a0
-  data.tar.gz: f63af16c444a3a5499cd9246b1d11bba2cd9a7a31efed58bfd23d5b1c8b3e0d3
+  metadata.gz: de9bb2ac6873a987cb7c7d0cdf51f8c11908d0d3ada729bd21bb4bc24d3aa3dc
+  data.tar.gz: 571507faa100bb620c116dbe11bdcad1b958c718c89a7f8572732ef3939ad70f
 SHA512:
-  metadata.gz: ed48f7f3870b346a17ec5e263c90c67f68b1f355a4900c3a79ae998bf689b1b549e6658d7c4165b934091669734bea561acf9991b82446a6ca4164558a488301
-  data.tar.gz: f87f347bf3a72e8d331e95d95ceca640d12754cb049ce4c39097b03b75d022c347f95062d3e311e0fb0cbc90f61050449ed1bd6f39f8682c95e935fccf7509f9
+  metadata.gz: 916cfb05143133cf1c0680d2495f2877997d607cac710063d3862acf62105d256434f0e3f9170599fa5d6c2a59c80ff39dace42584a0cce493b5f476ad6e8e5e
+  data.tar.gz: af7f87595e02ec5996c7a1ecf5aac7e7deb376ae4a32d30c250ad6293be3ce086a8a64074e88b79f6dcb2ce52b1c9861e7d7031119da58026bfff9e2ca841eb4

data/CHANGELOG.asciidoc

@@ -35,6 +35,14 @@ endif::[]
 [[release-notes-3.x]]
 === Ruby Agent version 3.x
 
+[[release-notes-3.12.1]]
+==== 3.12.1 (2020-11-16)
+
+[float]
+===== Fixed
+
+- `capture_elasticsearch_queries` no longer modifies the original query {pull}894[#894]
+
 [[release-notes-3.12.0]]
 ==== 3.12.0 (2020-11-10)
 

data/lib/elastic_apm/metadata/cloud_info.rb

@@ -73,7 +73,7 @@ module ElasticAPM
       def fetch_aws
         resp = @client.get(AWS_URI)
 
-        return unless resp.status === 200
+        return unless resp.status == 200
         return unless (metadata = JSON.parse(resp.body))
 
         self.provider = "aws"
@@ -89,7 +89,7 @@ module ElasticAPM
       def fetch_gcp
         resp = @client.headers("Metadata-Flavor" => "Google").get(GCP_URI)
 
-        return unless resp.status === 200
+        return unless resp.status == 200
         return unless (metadata = JSON.parse(resp.body))
 
         zone = metadata["instance"]["zone"]&.split("/")&.at(-1)
@@ -109,7 +109,7 @@ module ElasticAPM
       def fetch_azure
         resp = @client.headers("Metadata" => "true").get(AZURE_URI)
 
-        return unless resp.status === 200
+        return unless resp.status == 200
         return unless (metadata = JSON.parse(resp.body))
 
         self.provider = 'azure'

data/lib/elastic_apm/spies/elasticsearch.rb

@@ -53,7 +53,7 @@ module ElasticAPM
             if ElasticAPM.agent.config.capture_elasticsearch_queries
               unless args[1].nil? || args[1].empty?
                 statement << {
-                  body: ElasticAPM::Spies::ElasticsearchSpy.sanitizer.strip_from!(args[1])
+                  body: ElasticAPM::Spies::ElasticsearchSpy.sanitizer.strip_from(args[1])
                 }
               end
             end

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

@@ -17,6 +17,8 @@
 
 # frozen_string_literal: true
 
+require 'elastic_apm/util/deep_dup'
+
 module ElasticAPM
   module Transport
     module Filters
@@ -38,6 +40,10 @@ 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)
 

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

@@ -38,7 +38,9 @@ module ElasticAPM
           @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)
 

data/lib/elastic_apm/util/deep_dup.rb

@@ -0,0 +1,66 @@
+# 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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.12.0
+  version: 3.12.1
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-11-10 00:00:00.000000000 Z
+date: 2020-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -235,6 +235,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
@@ -260,7 +261,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The official Elastic APM agent for Ruby