oneapm_rpm 1.1.3 → 1.2.0

data/lib/one_apm/support/system_info.rb

@@ -1,14 +1,9 @@
 # encoding: utf-8
 
-# This module is intended to provide access to information about the host OS and
-# [virtual] machine. It intentionally does no caching and maintains no state -
-# caching should be handled by clients if needed. Methods should return nil if
-# the requested information is unavailable.
-
 require 'rbconfig'
 
 module OneApm
-  module Agent
+  module Support
     module SystemInfo
       def self.ruby_os_identifier
         RbConfig::CONFIG['target_os']

data/lib/one_apm/transaction/composite_segment.rb

@@ -0,0 +1,30 @@
+# encoding: utf-8
+
+require 'one_apm/transaction/transaction_sample'
+require 'one_apm/transaction/segment'
+require 'one_apm/transaction/summary_segment'
+
+module OneApm
+  class TransactionSample
+    class CompositeSegment < Segment
+      attr_reader :detail_segments
+
+      def initialize(segments)
+        summary = SummarySegment.new(segments.first)
+        super summary.entry_timestamp, "Repeating pattern (#{segments.length} repeats)"
+
+        summary.end_trace(segments.last.exit_timestamp)
+
+        @detail_segments = segments.clone
+
+        add_called_segment(summary)
+        end_trace summary.exit_timestamp
+      end
+
+      def detail_segments=(segments)
+        @detail_segments = segments
+      end
+
+    end
+  end
+end

data/lib/one_apm/transaction/sample_buffer/developer_mode_sample_buffer.rb

@@ -0,0 +1,58 @@
+# encoding: utf-8
+
+require 'one_apm/transaction/sample_buffer/transaction_sample_buffer'
+
+module OneApm
+  class Transaction
+    class DeveloperModeSampleBuffer < TransactionSampleBuffer
+
+      CAPACITY = 100
+
+      def capacity
+        max_capacity
+      end
+
+      # Dev mode is allowed more than the typical upper limit.
+      # Sidestep normal cap by overriding max_capacity.
+      def max_capacity
+        CAPACITY
+      end
+
+      def harvest_samples
+        NO_SAMPLES
+      end
+
+      def enabled?
+        Manager.config[:developer_mode]
+      end
+
+      # Truncate to the last capacity samples we've received
+      def truncate_samples
+        @samples = @samples.last(capacity)
+      end
+
+      # We don't hold onto previously trapped transactions on harvest
+      # We've already got all the traces we want, thank you!
+      def store_previous(*)
+      end
+
+      # Captures the stack trace for a segment
+      # This is expensive and not for production mode
+      def visit_segment(segment)
+        return unless enabled? && segment
+
+        trace = strip_oneapm_frames(caller)
+        trace = trace.first(40) if trace.length > 40
+        segment[:backtrace] = trace
+      end
+
+      def strip_oneapm_frames(trace)
+        while trace.first =~/\/lib\/one_apm\/agent\//
+          trace.shift
+        end
+        trace
+      end
+
+    end
+  end
+end

data/lib/one_apm/transaction/segment_summary.rb

@@ -41,11 +41,6 @@ module OneApm
         return 0 unless @total_time && @sample.duration && @sample.duration > 0
         @total_time / @sample.duration
       end
-
-      def ui_name
-        return @metric_name if @metric_name == 'Remainder'
-        OneApm::MetricParser::MetricParser.parse(@metric_name).developer_name
-      end
     end
   end
 end

data/lib/one_apm/transaction/summary_segment.rb

@@ -0,0 +1,24 @@
+# encoding: utf-8
+
+require 'one_apm/transaction/transaction_sample'
+require 'one_apm/transaction/segment'
+
+module OneApm
+  class TransactionSample
+    class SummarySegment < Segment
+      def initialize(segment)
+        super segment.entry_timestamp, segment.metric_name
+
+        add_segments segment.called_segments
+
+        end_trace segment.exit_timestamp
+      end
+
+      def add_segments(segments)
+        segments.collect do |segment|
+          SummarySegment.new(segment)
+        end.each {|segment| add_called_segment(segment)}
+      end
+    end
+  end
+end

data/lib/one_apm/transaction/transaction_sample.rb

@@ -4,6 +4,8 @@ require 'base64'
 
 require 'one_apm/transaction/segment'
 require 'one_apm/transaction/transaction_analysis'
+require 'one_apm/transaction/summary_segment'
+require 'one_apm/transaction/composite_segment'
 
 module OneApm
   # the number of segments that need to exist before we roll them up

data/lib/one_apm/version.rb

@@ -4,8 +4,8 @@ module OneApm
   module VERSION
 
     MAJOR = 1
-    MINOR = 1
-    TINY  = 3
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].compact.join('.')
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-18 00:00:00.000000000 Z
+date: 2015-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -238,26 +238,17 @@ files:
 - lib/one_apm/agent/database/obfuscation_helpers.rb
 - lib/one_apm/agent/database/obfuscator.rb
 - lib/one_apm/agent/database/postgres_explain_obfuscator.rb
-- lib/one_apm/agent/datastores.rb
-- lib/one_apm/agent/datastores/metric_helper.rb
-- lib/one_apm/agent/datastores/mongo.rb
-- lib/one_apm/agent/datastores/mongo/metric_translator.rb
-- lib/one_apm/agent/datastores/mongo/obfuscator.rb
-- lib/one_apm/agent/datastores/mongo/statement_formatter.rb
+- lib/one_apm/agent/datastore.rb
+- lib/one_apm/agent/datastore/metric_helper.rb
+- lib/one_apm/agent/datastore/mongo.rb
+- lib/one_apm/agent/datastore/mongo/metric_translator.rb
+- lib/one_apm/agent/datastore/mongo/obfuscator.rb
+- lib/one_apm/agent/datastore/mongo/statement_formatter.rb
 - lib/one_apm/agent/harvester.rb
 - lib/one_apm/agent/inbound_request_monitor.rb
 - lib/one_apm/agent/javascript_instrumentor.rb
-- lib/one_apm/agent/sampler.rb
-- lib/one_apm/agent/sampler_collection.rb
-- lib/one_apm/agent/samplers/cpu_sampler.rb
-- lib/one_apm/agent/samplers/delayed_job_sampler.rb
-- lib/one_apm/agent/samplers/memory_sampler.rb
-- lib/one_apm/agent/samplers/object_sampler.rb
-- lib/one_apm/agent/samplers/vm_sampler.rb
 - lib/one_apm/agent/synthetics_monitor.rb
 - lib/one_apm/agent/threading/agent_thread.rb
-- lib/one_apm/agent/threading/backtrace_node.rb
-- lib/one_apm/agent/threading/backtrace_service.rb
 - lib/one_apm/agent/threading/thread_profile.rb
 - lib/one_apm/collector/collector/helper.rb
 - lib/one_apm/collector/collector/http_connection.rb
@@ -275,12 +266,18 @@ files:
 - lib/one_apm/collector/containers/transaction_event_aggregator.rb
 - lib/one_apm/collector/containers/transaction_sampler.rb
 - lib/one_apm/collector/containers/utilization_data.rb
-- lib/one_apm/collector/forked_process_service.rb
+- lib/one_apm/collector/sampler.rb
+- lib/one_apm/collector/samplers/cpu_sampler.rb
+- lib/one_apm/collector/samplers/delayed_job_sampler.rb
+- lib/one_apm/collector/samplers/memory_sampler.rb
+- lib/one_apm/collector/samplers/object_sampler.rb
+- lib/one_apm/collector/samplers/vm_sampler.rb
 - lib/one_apm/collector/stats_engine/gc_profiler.rb
 - lib/one_apm/collector/stats_engine/metric_stats.rb
 - lib/one_apm/collector/stats_engine/stats_hash.rb
+- lib/one_apm/collector/support/forked_process_service.rb
+- lib/one_apm/collector/support/sampler_collection.rb
 - lib/one_apm/configuration.rb
-- lib/one_apm/configuration/autostart.rb
 - lib/one_apm/configuration/default_source.rb
 - lib/one_apm/configuration/environment_source.rb
 - lib/one_apm/configuration/high_security_source.rb
@@ -360,10 +357,42 @@ files:
 - lib/one_apm/probe/instance_methods.rb
 - lib/one_apm/probe/instrumentation.rb
 - lib/one_apm/rack/browser_monitoring.rb
+- lib/one_apm/rack/developer_mode.rb
+- lib/one_apm/rack/developer_mode/helper.rb
+- lib/one_apm/rack/developer_mode/views/oneapm/_explain_plans.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_home_right.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_sample.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_segment.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_segment_limit_message.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_segment_row.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_show_sample_detail.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_show_sample_sql.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_show_sample_summary.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_sql_row.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_stack_trace.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/_summary_table.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/images/arrow-close.png
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/images/arrow-open.png
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/images/oneapm_logo.png
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/javascript/c3.min.js
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/javascript/d3.min.js
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/javascript/jquery.min.js
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/javascript/transaction_sample.js
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/stylesheets/bootstrap.min.css
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/stylesheets/c3.css
+- lib/one_apm/rack/developer_mode/views/oneapm/assets/stylesheets/style.css
+- lib/one_apm/rack/developer_mode/views/oneapm/explain_sql.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/index.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/layout.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/sample_not_found.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/show_sample.html.erb
+- lib/one_apm/rack/developer_mode/views/oneapm/threads.html.erb
 - lib/one_apm/rack/middleware_base.rb
 - lib/one_apm/rack/middleware_hooks.rb
 - lib/one_apm/rack/middleware_tracing.rb
 - lib/one_apm/rack/middleware_wrapper.rb
+- lib/one_apm/support/backtrace/backtrace_node.rb
+- lib/one_apm/support/backtrace/backtrace_service.rb
 - lib/one_apm/support/chained_call.rb
 - lib/one_apm/support/coerce.rb
 - lib/one_apm/support/collection_helper.rb
@@ -415,8 +444,10 @@ files:
 - lib/one_apm/support/vm/snapshot.rb
 - lib/one_apm/transaction.rb
 - lib/one_apm/transaction/class_methods.rb
+- lib/one_apm/transaction/composite_segment.rb
 - lib/one_apm/transaction/instance_helpers.rb
 - lib/one_apm/transaction/metric_constants.rb
+- lib/one_apm/transaction/sample_buffer/developer_mode_sample_buffer.rb
 - lib/one_apm/transaction/sample_buffer/force_persist_sample_buffer.rb
 - lib/one_apm/transaction/sample_buffer/slowest_sample_buffer.rb
 - lib/one_apm/transaction/sample_buffer/synthetics_sample_buffer.rb
@@ -424,6 +455,7 @@ files:
 - lib/one_apm/transaction/sample_buffer/xray_sample_buffer.rb
 - lib/one_apm/transaction/segment.rb
 - lib/one_apm/transaction/segment_summary.rb
+- lib/one_apm/transaction/summary_segment.rb
 - lib/one_apm/transaction/thread_local_access.rb
 - lib/one_apm/transaction/transaction_analysis.rb
 - lib/one_apm/transaction/transaction_apdex.rb

data/lib/one_apm/configuration/autostart.rb

@@ -1,41 +0,0 @@
-# encoding: utf-8
-
-module OneApm
-  module Configuration
-    module Autostart
-      extend self
-
-      def agent_should_start?
-          !blacklisted_constants? &&
-          !blacklisted_executables? &&
-          !in_blacklisted_rake_task?
-      end
-
-      def blacklisted_constants?
-        blacklisted?(OneApm::Manager.config[:'autostart.blacklisted_constants']) do |name|
-          OneApm::LanguageSupport.constant_is_defined?(name)
-        end
-      end
-
-      def blacklisted_executables?
-        blacklisted?(OneApm::Manager.config[:'autostart.blacklisted_executables']) do |bin|
-          File.basename($0) == bin
-        end
-      end
-
-      def blacklisted?(value, &block)
-        value.split(/\s*,\s*/).any?(&block)
-      end
-
-      def in_blacklisted_rake_task?
-        tasks = begin
-                  ::Rake.application.top_level_tasks
-                rescue => e
-                  OneApm::Manager.logger.debug("Not in Rake environment so skipping blacklisted_rake_tasks check: #{e}")
-                  []
-                end
-        !(tasks & OneApm::Manager.config[:'autostart.blacklisted_rake_tasks'].split(/\s*,\s*/)).empty?
-      end
-    end
-  end
-end