elastic-apm 2.6.1 → 2.7.0

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

@@ -0,0 +1,116 @@
+# frozen_string_literal: true
+
+require 'http'
+require 'concurrent'
+require 'zlib'
+
+require 'elastic_apm/transport/connection/proxy_pipe'
+
+module ElasticAPM
+  module Transport
+    class Connection
+      # @api private
+      class Http
+        include Logging
+
+        def initialize(config)
+          @config = config
+          @closed = Concurrent::AtomicBoolean.new
+
+          @rd, @wr = ProxyPipe.pipe(compress: @config.http_compression?)
+        end
+
+        def open(url, headers: {}, ssl_context: nil)
+          @request = open_request_in_thread(url, headers, ssl_context)
+        end
+
+        def self.open(config, url, headers: {}, ssl_context: nil)
+          new(config).tap do |http|
+            http.open(url, headers: headers, ssl_context: ssl_context)
+          end
+        end
+
+        def write(str)
+          @wr.write(str)
+          @wr.bytes_sent
+        end
+
+        def close(reason)
+          return if closed?
+
+          debug '%s: Closing request with reason %s', thread_str, reason
+          @closed.make_true
+
+          @wr&.close(reason)
+          return if @request.nil? || @request&.join(5)
+
+          error(
+            '%s: APM Server not responding in time, terminating request',
+            thread_str
+          )
+          @request.kill
+        end
+
+        def closed?
+          @closed.true?
+        end
+
+        def inspect
+          format(
+            '%s closed: %s>',
+            super.split.first,
+            closed?
+          )
+        end
+
+        private
+
+        def thread_str
+          format('[THREAD:%s]', Thread.current.object_id)
+        end
+
+        # rubocop:disable Metrics/LineLength
+        def open_request_in_thread(url, headers, ssl_context)
+          client = build_client(headers)
+
+          debug '%s: Opening new request', thread_str
+          Thread.new do
+            begin
+              post(client, url, ssl_context)
+            rescue Exception => e
+              error "Couldn't establish connection to APM Server:\n%p", e.inspect
+            end
+          end
+        end
+        # rubocop:enable Metrics/LineLength
+
+        def build_client(headers)
+          client = HTTP.headers(headers)
+          return client unless @config.proxy_address && @config.proxy_port
+
+          client.via(
+            @config.proxy_address,
+            @config.proxy_port,
+            @config.proxy_username,
+            @config.proxy_password,
+            @config.proxy_headers
+          )
+        end
+
+        def post(client, url, ssl_context)
+          resp = client.post(
+            url,
+            body: @rd,
+            ssl_context: ssl_context
+          ).flush
+
+          if resp&.status == 202
+            debug 'APM Server responded with status 202'
+          elsif resp
+            error "APM Server responded with an error:\n%p", resp.body.to_s
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+require 'concurrent'
+require 'zlib'
+
+module ElasticAPM
+  module Transport
+    class Connection
+      # @api private
+      class ProxyPipe
+        def initialize(enc = nil, compress: true)
+          @read, wr = IO.pipe(enc)
+          @write = Write.new(wr, compress: compress)
+        end
+
+        attr_reader :read, :write
+
+        # @api private
+        class Write
+          include Logging
+
+          def initialize(io, compress: true)
+            @io = io
+            @compress = compress
+            @bytes_sent = Concurrent::AtomicFixnum.new(0)
+            @config = ElasticAPM.agent&.config # this is silly, fix Logging
+
+            return unless compress
+            enable_compression!
+          end
+
+          attr_reader :io
+
+          def enable_compression!
+            io.binmode
+            @io = Zlib::GzipWriter.new(io)
+          end
+
+          def close(reason = nil)
+            debug("Closing writer with reason #{reason}")
+            io.close
+          end
+
+          def closed?
+            io.closed?
+          end
+
+          def write(str)
+            io.puts(str).tap do
+              @bytes_sent.update do |curr|
+                @compress ? io.tell : curr + str.bytesize
+              end
+            end
+          end
+
+          def bytes_sent
+            @bytes_sent.value
+          end
+        end
+
+        def self.pipe(*args)
+          pipe = new(*args)
+          [pipe.read, pipe.write]
+        end
+      end
+    end
+  end
+end

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

@@ -29,6 +29,7 @@ module ElasticAPM
 
         def call(payload)
           strip_from! payload.dig(:transaction, :context, :request, :headers)
+          strip_from! payload.dig(:transaction, :context, :request, :env)
           strip_from! payload.dig(:transaction, :context, :response, :headers)
           strip_from! payload.dig(:error, :context, :request, :headers)
           strip_from! payload.dig(:error, :context, :response, :headers)

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

@@ -55,7 +55,8 @@ module ElasticAPM
           {
             hostname: keyword_field(system.hostname),
             architecture: keyword_field(system.architecture),
-            platform: keyword_field(system.platform)
+            platform: keyword_field(system.platform),
+            kubernetes: keyword_object(system.kubernetes)
           }
         end
       end

data/lib/elastic_apm/transport/worker.rb

@@ -22,8 +22,6 @@ module ElasticAPM
         @config = config
         @queue = queue
 
-        @stopping = false
-
         @serializers = serializers
         @filters = filters
 
@@ -33,29 +31,17 @@ module ElasticAPM
 
       attr_reader :queue, :filters, :name, :connection, :serializers
 
-      def stop
-        @stopping = true
-      end
-
-      def stopping?
-        @stopping
-      end
-
       # rubocop:disable Metrics/MethodLength
       def work_forever
         while (msg = queue.pop)
           case msg
           when StopMessage
-            stop
+            debug 'Stopping worker -- %s', self
+            connection.flush(:halt)
+            break
           else
             process msg
           end
-
-          next unless stopping?
-
-          debug 'Stopping worker -- %s', self
-          @connection.flush
-          break
         end
       rescue Exception => e
         warn 'Worker died with exception: %s', e.inspect
@@ -63,12 +49,21 @@ module ElasticAPM
       end
       # rubocop:enable Metrics/MethodLength
 
+      def process(resource)
+        return unless (json = serialize_and_filter(resource))
+        connection.write(json)
+      end
+
       private
 
-      def process(resource)
+      def serialize_and_filter(resource)
         serialized = serializers.serialize(resource)
         @filters.apply!(serialized)
-        @connection.write(serialized.to_json)
+        JSON.fast_generate(serialized)
+      rescue Exception
+        error format('Failed converting event to JSON: %s', resource.inspect)
+        error serialized.inspect
+        nil
       end
     end
   end

data/lib/elastic_apm/util.rb

@@ -21,8 +21,10 @@ module ElasticAPM
       str.hex.to_s(2).rjust(str.size * 4, '0')
     end
 
-    def self.reverse_merge!(first, second)
-      first.merge!(second) { |_, old, _| old }
+    def self.reverse_merge!(first, *others)
+      others.reduce(first) do |curr, other|
+        curr.merge!(other) { |_, _, new| new }
+      end
     end
 
     def self.truncate(value, max_length: 1024)

data/lib/elastic_apm/util/throttle.rb

@@ -0,0 +1,35 @@
+# frozen_string_literal: true
+
+module ElasticAPM
+  module Util
+    # @api private
+
+    # Usage example:
+    #   Throttle.new(5) { thing to only do once per 5 secs }
+    class Throttle
+      def initialize(buffer_secs, &block)
+        @buffer_secs = buffer_secs
+        @block = block
+      end
+
+      def call
+        if @last_call && seconds_since_last_call < @buffer_secs
+          return @last_result
+        end
+
+        @last_call = now
+        @last_result = @block.call
+      end
+
+      private
+
+      def now
+        Process.clock_gettime(Process::CLOCK_MONOTONIC)
+      end
+
+      def seconds_since_last_call
+        now - @last_call
+      end
+    end
+  end
+end

data/lib/elastic_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: elastic-apm
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.7.0
 platform: ruby
 authors:
 - Mikkel Malmberg
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-28 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -79,6 +79,7 @@ files:
 - docs/introduction.asciidoc
 - docs/metrics.asciidoc
 - docs/opentracing.asciidoc
+- docs/release-notes.asciidoc
 - docs/supported-technologies.asciidoc
 - elastic-apm.gemspec
 - lib/elastic-apm.rb
@@ -146,6 +147,8 @@ files:
 - lib/elastic_apm/transaction.rb
 - lib/elastic_apm/transport/base.rb
 - lib/elastic_apm/transport/connection.rb
+- lib/elastic_apm/transport/connection/http.rb
+- 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/serializers.rb
@@ -160,6 +163,7 @@ files:
 - 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
 homepage: https://github.com/elastic/apm-agent-ruby