baseline_red_rpm 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 2f48e985c64b6fe5ef0768cd698bdff34087adaf
-  data.tar.gz: 616121b88979893ded3bdc189d275621aee00f34
+SHA256:
+  metadata.gz: bbe846afd5e21455189a3cd36e1de25cd9cd3762d81d3abccaee1c731fa2f909
+  data.tar.gz: 9779e986323a331505d8af5c14a32aeaa53c83370b2fb4bbebad096fd061f29d
 SHA512:
-  metadata.gz: 472252bfc20315849876f30e1c9cff7a7916f53ffa0ffa300812344215168733ba4044d02127870ae0730f0568ef2a69f5eae0baa1c290c46ee71777ac1c9fc5
-  data.tar.gz: f1460dd9d695924e8ffcc177ba4ac96962dac1f73f2ea77e5a5378a551d7947be8bb6672c22053e80fbb0c5d921868a732ed29580c48fcc14128a57843a7fdf1
+  metadata.gz: 4144a1f7f3236e8b3078531acc6ce2bd343b04f2e55965009528bdab1aa86b1933a1d8f990bb1e99e779495de35ad34392797408894a6ef1d0d79b8f77e8932f
+  data.tar.gz: b85bda34c12ee20e75a66e6086e13ccee2d24bf3927ac9c986c4b830c5b7c53fc7e5b14420fb0223bdb722a58a818182d05950430beb0a7fd6668734b70331d3

data/lib/baseline_red_rpm/configuration.rb

@@ -15,6 +15,7 @@ module BaselineRedRpm
                   :application_name,
                   :instrumentation,
                   :agent_disabled,
+                  :sample_memory,
                   :ignore_paths
 
     def initialize
@@ -24,7 +25,7 @@ module BaselineRedRpm
     def reload
       ::BaselineRedRpm.mutex.synchronize do
         self.app_root = app_root ? Pathname.new(app_root.to_s) : nil
-        self.host ||= default_if_blank(ENV["BASELINE_RED_HOST"], "http://localhost:5000")
+        self.host ||= default_if_blank(ENV["BASELINE_RED_HOST"], "https://baseline.red")
         self.ssl ||= default_if_blank(ENV["BASELINE_RED_SSL"], false)
         self.license_key ||= default_if_blank(ENV["BASELINE_RED_LICENSE_KEY"], nil)
         self.application_name ||= "Default"
@@ -32,6 +33,7 @@ module BaselineRedRpm
         self.sample_threshold ||= 0 # Minimum amount of duration to sample
         self.flush_interval ||= 60 # In seconds
         self.agent_disabled ||= default_if_blank(ENV["BASELINE_RED_AGENT_DISABLED"], false)
+        self.sample_memory ||= false
         self.ignore_paths ||= /\/assets/
         self.instrumentation = {
           :rack                    => { :enabled => true, :backtrace => :app, :source => true, :trace_middleware => false },

data/lib/baseline_red_rpm/reporters/json_client.rb

@@ -7,6 +7,8 @@ require 'base64'
 module BaselineRedRpm
   module Reporters
     class JsonClient
+      attr_accessor :sample_memory
+      
       def initialize(opts = { :url => nil, :collector => nil, :flush_interval => nil })
         @collector = opts[:collector]
         @flush_interval = opts[:flush_interval]
@@ -16,7 +18,11 @@ module BaselineRedRpm
       def start
         @thread = Thread.new do
           loop do
-            emit_batch(@collector.retrieve)
+            memory_stats = MemoryProfiler.stop
+
+            emit_batch(@collector.retrieve, memory_stats)
+
+            start_memory_profiler
             sleep @flush_interval
           end
         end
@@ -29,10 +35,18 @@ module BaselineRedRpm
 
       private
 
-      def compress_body(data)
+      def start_memory_profiler
+        return unless BaselineRedRpm.config.sample_memory
+        if Time.now.utc - BaselineRedRpm.config.sample_memory < 5.minutes
+          MemoryProfiler.start
+        end
+      end
+
+      def compress_body(data, memory_stats)
         body = MessagePack.pack({
           "name" => BaselineRedRpm.config.application_name,
           "host" => BaselineRedRpm.host,
+          "memory_stats" => memory_stats,
           "data" => data
         })
 
@@ -40,7 +54,7 @@ module BaselineRedRpm
         Base64.encode64(compressed_body)
       end
 
-      def emit_batch(spans)
+      def emit_batch(spans, memory_stats)
         return if spans.empty?
 
         sock = Net::HTTP.new(@spans_uri.host, @spans_uri.port)
@@ -50,7 +64,7 @@ module BaselineRedRpm
           "Accept-Encoding" => "gzip",
           "User-Agent" => "gzip"
         })
-        request.body = compress_body(spans)
+        request.body = compress_body(spans, memory_stats)
         request.content_type = "application/octet-stream"
 
         response = sock.start do |http|
@@ -60,6 +74,10 @@ module BaselineRedRpm
 
         if response.code != 202
           STDERR.puts(response.body)
+        elsif response.code == 200
+          json = JSON.parse(response.body)
+          BaselineRedRpm.config.sample_memory =
+              json['sample_memory'].present? ?  Time.parse(json['sample_memory']) : nil
         end
       rescue => e
         STDERR.puts("Error emitting spans batch: #{e.message}\n#{e.backtrace.join("\n")}")

data/lib/baseline_red_rpm.rb

@@ -73,6 +73,8 @@ module BaselineRedRpm
         collector: collector,
         flush_interval: config.flush_interval
       )
+      @sender.sample_memory = config.sample_memory
+      @sender
     end
 
     def tracer

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baseline_red_rpm
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jim Jones
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-11-24 00:00:00.000000000 Z
+date: 2018-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
@@ -204,8 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Baseline Red Ruby Agent