elastic-apm 3.1.0 → 3.2.0

data/lib/elastic_apm/transport/connection/proxy_pipe.rb

@@ -1,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'concurrent'
-require 'zlib'
-
 module ElasticAPM
   module Transport
     class Connection

data/lib/elastic_apm/transport/headers.rb

@@ -0,0 +1,62 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Transport
+    # @api private
+    class Headers
+      HEADERS = {
+        'Content-Type' => 'application/x-ndjson',
+        'Transfer-Encoding' => 'chunked'
+      }.freeze
+      GZIP_HEADERS = HEADERS.merge(
+        'Content-Encoding' => 'gzip'
+      ).freeze
+
+      def initialize(config, initial: {})
+        @config = config
+        @hash = build!(initial)
+      end
+
+      attr_accessor :hash
+
+      def [](key)
+        @hash[key]
+      end
+
+      def []=(key, value)
+        @hash[key] = value
+      end
+
+      def merge(other)
+        self.class.new(@config, initial: @hash.merge(other))
+      end
+
+      def merge!(other)
+        @hash.merge!(other)
+        self
+      end
+
+      def to_h
+        @hash
+      end
+
+      def chunked
+        merge(
+          @config.http_compression? ? GZIP_HEADERS : HEADERS
+        )
+      end
+
+      private
+
+      def build!(headers)
+        headers[:'User-Agent'] = UserAgent.new(@config).to_s
+
+        if (token = @config.secret_token)
+          headers[:Authorization] = "Bearer #{token}"
+        end
+
+        headers
+      end
+    end
+  end
+end

data/lib/elastic_apm/transport/serializers.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'json'
-
 module ElasticAPM
   module Transport
     # @api private

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

@@ -5,15 +5,28 @@ module ElasticAPM
     module Serializers
       # @api private
       class MetricsetSerializer < Serializer
+        # rubocop:disable Metrics/MethodLength
         def build(metricset)
-          {
-            metricset: {
-              timestamp: metricset.timestamp.to_i,
-              tags: keyword_object(metricset.labels),
-              samples: build_samples(metricset.samples)
-            }
+          payload = {
+            timestamp: metricset.timestamp.to_i,
+            samples: build_samples(metricset.samples)
           }
+
+          if metricset.tags?
+            payload[:tags] = mixed_object(metricset.tags)
+          end
+
+          if metricset.transaction
+            payload[:transaction] = metricset.transaction
+          end
+
+          if metricset.span
+            payload[:span] = metricset.span
+          end
+
+          { metricset: payload }
         end
+        # rubocop:enable Metrics/MethodLength
 
         private
 

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

@@ -13,12 +13,12 @@ module ElasticAPM
 
         attr_reader :context_serializer
 
-        # rubocop:disable Metrics/MethodLength
+        # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
         def build(span)
           {
             span: {
               id: span.id,
-              transaction_id: span.transaction_id,
+              transaction_id: span.transaction.id,
               parent_id: span.parent_id,
               name: keyword_field(span.name),
               type: join_type(span),
@@ -30,7 +30,7 @@ module ElasticAPM
             }
           }
         end
-        # rubocop:enable Metrics/MethodLength
+        # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
 
         # @api private
         class ContextSerializer < Serializer

data/lib/elastic_apm/transport/user_agent.rb

@@ -0,0 +1,31 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Transport
+    # @api private
+    class UserAgent
+      def initialize(config)
+        @built = build(config)
+      end
+
+      def to_s
+        @built
+      end
+
+      private
+
+      def build(config)
+        metadata = Metadata.new(config)
+
+        [
+          "elastic-apm-ruby/#{VERSION}",
+          HTTP::Request::USER_AGENT,
+          [
+            metadata.service.runtime.name,
+            metadata.service.runtime.version
+          ].join('/')
+        ].join(' ')
+      end
+    end
+  end
+end

data/lib/elastic_apm/transport/worker.rb

@@ -25,8 +25,7 @@ module ElasticAPM
         @serializers = serializers
         @filters = filters
 
-        metadata = serializers.serialize(Metadata.new(config))
-        @connection = conn_adapter.new(config, metadata)
+        @connection = conn_adapter.new(config)
       end
 
       attr_reader :queue, :filters, :name, :connection, :serializers

data/lib/elastic_apm/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ElasticAPM
-  VERSION = '3.1.0'
+  VERSION = '3.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-21 00:00:00.000000000 Z
+date: 2019-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -69,6 +69,7 @@ files:
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - CONTRIBUTING.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.md
@@ -82,8 +83,11 @@ files:
 - bench/tmp/.gitkeep
 - bin/build_docs
 - bin/console
+- bin/dev
+- bin/run-tests
 - bin/setup
 - bin/with_framework
+- docker-compose.yml
 - docs/advanced.asciidoc
 - docs/api.asciidoc
 - docs/configuration.asciidoc
@@ -106,6 +110,7 @@ files:
 - lib/elastic_apm/agent.rb
 - lib/elastic_apm/central_config.rb
 - lib/elastic_apm/central_config/cache_control.rb
+- lib/elastic_apm/child_durations.rb
 - lib/elastic_apm/config.rb
 - lib/elastic_apm/config/bytes.rb
 - lib/elastic_apm/config/duration.rb
@@ -123,6 +128,7 @@ files:
 - lib/elastic_apm/error/exception.rb
 - lib/elastic_apm/error/log.rb
 - lib/elastic_apm/error_builder.rb
+- lib/elastic_apm/grape.rb
 - lib/elastic_apm/instrumenter.rb
 - lib/elastic_apm/internal_error.rb
 - lib/elastic_apm/logging.rb
@@ -132,12 +138,19 @@ files:
 - lib/elastic_apm/metadata/system_info.rb
 - lib/elastic_apm/metadata/system_info/container_info.rb
 - lib/elastic_apm/metrics.rb
-- lib/elastic_apm/metrics/cpu_mem.rb
-- lib/elastic_apm/metrics/vm.rb
+- lib/elastic_apm/metrics/breakdown_set.rb
+- lib/elastic_apm/metrics/cpu_mem_set.rb
+- lib/elastic_apm/metrics/metric.rb
+- lib/elastic_apm/metrics/set.rb
+- lib/elastic_apm/metrics/span_scoped_set.rb
+- lib/elastic_apm/metrics/transaction_set.rb
+- lib/elastic_apm/metrics/vm_set.rb
 - lib/elastic_apm/metricset.rb
 - lib/elastic_apm/middleware.rb
 - lib/elastic_apm/naively_hashable.rb
 - lib/elastic_apm/normalizers.rb
+- lib/elastic_apm/normalizers/grape.rb
+- lib/elastic_apm/normalizers/grape/endpoint_run.rb
 - lib/elastic_apm/normalizers/rails.rb
 - lib/elastic_apm/normalizers/rails/action_controller.rb
 - lib/elastic_apm/normalizers/rails/action_mailer.rb
@@ -178,6 +191,7 @@ files:
 - lib/elastic_apm/transport/connection/proxy_pipe.rb
 - lib/elastic_apm/transport/filters.rb
 - lib/elastic_apm/transport/filters/secrets_filter.rb
+- lib/elastic_apm/transport/headers.rb
 - lib/elastic_apm/transport/serializers.rb
 - lib/elastic_apm/transport/serializers/context_serializer.rb
 - lib/elastic_apm/transport/serializers/error_serializer.rb
@@ -185,11 +199,11 @@ files:
 - lib/elastic_apm/transport/serializers/metricset_serializer.rb
 - lib/elastic_apm/transport/serializers/span_serializer.rb
 - lib/elastic_apm/transport/serializers/transaction_serializer.rb
+- lib/elastic_apm/transport/user_agent.rb
 - lib/elastic_apm/transport/worker.rb
 - lib/elastic_apm/util.rb
 - lib/elastic_apm/util/inflector.rb
 - lib/elastic_apm/util/lru_cache.rb
-- lib/elastic_apm/util/prefixed_logger.rb
 - lib/elastic_apm/util/throttle.rb
 - lib/elastic_apm/version.rb
 - vendor/.gitkeep
@@ -213,7 +227,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: The official Elastic APM agent for Ruby

data/lib/elastic_apm/metrics/vm.rb

@@ -1,60 +0,0 @@
-# frozen_string_literal: true
-
-module ElasticAPM
-  module Metrics
-    # @api private
-    class VM
-      include Logging
-
-      def initialize(config)
-        @config = config
-        @total_time = 0
-        @disabled = false
-      end
-
-      attr_reader :config
-      attr_writer :disabled
-
-      # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
-      # rubocop:disable Metrics/CyclomaticComplexity
-      def collect
-        return if disabled?
-
-        stat = GC.stat
-        thread_count = Thread.list.count
-
-        sample = {
-          'ruby.gc.count': stat[:count],
-          'ruby.threads': thread_count
-        }
-
-        (live_slots = stat[:heap_live_slots]) &&
-          sample[:'ruby.heap.slots.live'] = live_slots
-        (heap_slots = stat[:heap_free_slots]) &&
-          sample[:'ruby.heap.slots.free'] = heap_slots
-        (allocated = stat[:total_allocated_objects]) &&
-          sample[:'ruby.heap.allocations.total'] = allocated
-
-        return sample unless GC::Profiler.enabled?
-
-        @total_time += GC::Profiler.total_time
-        GC::Profiler.clear
-        sample[:'ruby.gc.time'] = @total_time
-
-        sample
-      rescue TypeError => e
-        error 'VM metrics encountered error: %s', e
-        debug('Backtrace:') { e.backtrace.join("\n") }
-
-        @disabled = true
-        nil
-      end
-      # rubocop:enable Metrics/CyclomaticComplexity
-      # rubocop:enable Metrics/MethodLength, Metrics/AbcSize
-
-      def disabled?
-        @disabled
-      end
-    end
-  end
-end

data/lib/elastic_apm/util/prefixed_logger.rb

@@ -1,18 +0,0 @@
-# frozen_string_literal: true
-
-module ElasticAPM
-  # @api private
-  class PrefixedLogger < Logger
-    def initialize(logdev, prefix: '', **args)
-      super(logdev, **args)
-
-      @prefix = prefix
-    end
-
-    attr_reader :prefix
-
-    def add(severity, message = nil, progname = nil, &block)
-      super(severity, message, format('%s%s', prefix, progname), &block)
-    end
-  end
-end