elastic-apm 3.10.1 → 3.13.0

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

@@ -42,14 +42,15 @@ module ElasticAPM
               context: context_serializer.build(span.context),
               stacktrace: span.stacktrace.to_a,
               timestamp: span.timestamp,
-              trace_id: span.trace_id
+              trace_id: span.trace_id,
+              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
 
@@ -66,7 +67,6 @@ module ElasticAPM
 
             base
           end
-          # rubocop:enable Metrics/CyclomaticComplexity
 
           private
 

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

@@ -35,9 +35,11 @@ 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?,
+              sample_rate: transaction.sample_rate,
               context: context_serializer.build(transaction.context),
               span_count: {
                 started: transaction.started_spans,

data/lib/elastic_apm/transport/user_agent.rb

@@ -32,14 +32,14 @@ module ElasticAPM
       private
 
       def build(config)
-        metadata = Metadata.new(config)
+        service = Metadata::ServiceInfo.new(config)
 
         [
           "elastic-apm-ruby/#{VERSION}",
           HTTP::Request::USER_AGENT,
           [
-            metadata.service.runtime.name,
-            metadata.service.runtime.version
+            service.runtime.name,
+            service.runtime.version
           ].join('/')
         ].join(' ')
       end

data/lib/elastic_apm/transport/worker.rb

@@ -53,6 +53,7 @@ module ElasticAPM
       end
 
       attr_reader :queue, :filters, :name, :connection, :serializers
+
       def work_forever
         while (msg = queue.pop)
           case msg

data/lib/elastic_apm/util.rb

@@ -46,6 +46,8 @@ module ElasticAPM
 
     def self.truncate(value, max_length: 1024)
       return unless value
+
+      value = String(value)
       return value if value.length <= max_length
 
       value[0...(max_length - 1)] + '…'

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

@@ -0,0 +1,46 @@
+# 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
+    # Rounds half away from zero.
+    # If `minimum` is provided, and the value rounds to 0 (but was not zero to
+    # begin with), use the minimum instead.
+    module PrecisionValidator
+      module_function
+
+      def validate(value, precision: 0, minimum: nil)
+        float = Float(value)
+        return nil unless (0.0..1.0).cover?(float)
+        return float if float == 0
+
+        multiplier = Float(10**precision)
+        rounded = (float * multiplier + 0.5).floor / multiplier
+        if rounded == 0 && minimum
+          minimum
+        else
+          rounded
+        end
+      rescue ArgumentError
+        nil
+      end
+    end
+  end
+end

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.10.1
+  version: 3.13.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-26 00:00:00.000000000 Z
+date: 2020-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -69,6 +69,8 @@ files:
 - ".github/ISSUE_TEMPLATE/Bug_report.md"
 - ".github/ISSUE_TEMPLATE/Feature_request.md"
 - ".github/PULL_REQUEST_TEMPLATE.md"
+- ".github/labeler-config.yml"
+- ".github/workflows/labeler.yml"
 - ".gitignore"
 - ".pre-commit-config.yaml"
 - ".rspec"
@@ -126,8 +128,10 @@ 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
 - lib/elastic_apm/config/wildcard_pattern_list.rb
 - lib/elastic_apm/context.rb
 - lib/elastic_apm/context/request.rb
@@ -148,6 +152,7 @@ files:
 - lib/elastic_apm/internal_error.rb
 - lib/elastic_apm/logging.rb
 - lib/elastic_apm/metadata.rb
+- lib/elastic_apm/metadata/cloud_info.rb
 - lib/elastic_apm/metadata/process_info.rb
 - lib/elastic_apm/metadata/service_info.rb
 - lib/elastic_apm/metadata/system_info.rb
@@ -233,8 +238,10 @@ 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
 - lib/elastic_apm/util/throttle.rb
 - lib/elastic_apm/version.rb
 homepage: https://github.com/elastic/apm-agent-ruby
@@ -257,7 +264,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: The official Elastic APM agent for Ruby