mmtrix_rpm 1.0.0.1 → 1.0.0.2

data/lib/mmtrix/agent/instrumentation/rails_middleware.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/instrumentation/middleware_proxy'
 

data/lib/mmtrix/agent/instrumentation/rainbows_instrumentation.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :rainbows

data/lib/mmtrix/agent/instrumentation/resque.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :resque

data/lib/mmtrix/agent/instrumentation/rubyprof.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   named :rubyprof

data/lib/mmtrix/agent/instrumentation/sequel.rb

@@ -1,7 +1,7 @@
 # -*- ruby -*-
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :sequel

data/lib/mmtrix/agent/instrumentation/sequel_helper.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/instrumentation/sidekiq.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :sidekiq

data/lib/mmtrix/agent/instrumentation/sinatra/ignorer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/instrumentation/sinatra/transaction_namer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/instrumentation/sinatra.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/instrumentation/controller_instrumentation'
 require 'mmtrix/agent/instrumentation/sinatra/transaction_namer'

data/lib/mmtrix/agent/instrumentation/sunspot.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   @name = :sunspot

data/lib/mmtrix/agent/instrumentation/typhoeus.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 DependencyDetection.defer do
   named :typhoeus

data/lib/mmtrix/agent/instrumentation.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent'
 module Mmtrix

data/lib/mmtrix/agent/internal_agent_error.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # This is the base class for all errors that we want to record through the
 # Mmtrix::Agent::ErrorCollector#notice_agent_error API. It provides the

data/lib/mmtrix/agent/javascript_instrumentor.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'base64'
 require 'mmtrix/agent/obfuscator'

data/lib/mmtrix/agent/log_once.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/memory_logger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # Base class for startup logging and testing in multiverse
 

data/lib/mmtrix/agent/method_tracer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # This file may be independently required to set up method tracing prior to
 # the full agent loading. In those cases, we do need at least this require to

data/lib/mmtrix/agent/method_tracer_helpers.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/mmtrix_service/encoders.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'base64'
 require 'zlib'

data/lib/mmtrix/agent/mmtrix_service/json_marshaller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/mmtrix_service/marshaller'
 

data/lib/mmtrix/agent/mmtrix_service/marshaller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/mmtrix_service/pruby_marshaller.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/mmtrix_service/marshaller'
 

data/lib/mmtrix/agent/mmtrix_service.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'zlib'
 require 'mmtrix/agent/audit_logger'
@@ -363,11 +363,11 @@ module Mmtrix
         # end.compact.join('&')
 
         params = {'license_key' => @license_key,'run_id' => @agent_id, 'marshal_format' => format }
-        # if (method == :get_redirect_host||method == :connect)
-        #   uri = "/rubyagent/#{method}"
-        # else
-          uri = "/workdone_rubyagent.php/#{method}"
-        # end
+        if (method == :get_redirect_host||method == :connect)
+          uri = "/apmagent/rubyagent/#{method}"
+        else
+          uri = "/workdone_rubydata.php/#{method}"
+        end
 
         uri << '?' + params.map do |k,v|
           next unless v
@@ -382,9 +382,9 @@ module Mmtrix
       # enough to be worth compressing, and handles any errors the
       # server may return
       def invoke_remote(method, payload = [], options = {})
-        puts "method -- #{method}"
-        puts "options -- #{options}"
-        puts "payload -- #{payload}"
+        # puts "method -- #{method}"
+        # puts "options -- #{options}"
+        # puts "payload -- #{payload}"
 
         start_ts = Time.now
 
@@ -395,22 +395,22 @@ module Mmtrix
           handle_serialization_error(method, e)
         end
 
-        puts "data -- #{data}"
+        # puts "data -- #{data}"
 
         serialize_finish_ts = Time.now
 
         data, encoding = compress_request_if_needed(data)
         size = data.size
 
-        mycollect = Mmtrix::Control::Server.new("dev.mmtrix.com", "8207")
+        mycollect = Mmtrix::Control::Server.new("mob.mmtrix.com", "8080")
         if (method == :get_redirect_host||method == :connect)
-          mycollect = Mmtrix::Control::Server.new("dev.mmtrix.com", "8207")
+          mycollect = Mmtrix::Control::Server.new("mob.mmtrix.com", "8080")
         end
 
         uri = remote_method_uri(method, @marshaller.format)
         # full_uri = "#{@collector}#{uri}"
         full_uri = "#{mycollect}#{uri}"
-        puts "full_uri -- #{full_uri}"
+        # puts "full_uri -- #{full_uri}"
 
         @audit_logger.log_request(full_uri, payload, @marshaller)
 
@@ -423,8 +423,8 @@ module Mmtrix
         #                         :uri       => uri,
         #                         :encoding  => encoding,
         #                         :collector => @collector)
-        puts "response -- #{response}"
-        puts "response -- #{decompress_response(response)}"
+        # puts "response -- #{response}"
+        # puts "response -- #{decompress_response(response)}"
 
         @marshaller.load(decompress_response(response))
 

data/lib/mmtrix/agent/null_logger.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # A stub object that we can use in place of a real Logger instance when
 # the agent is disabled.

data/lib/mmtrix/agent/obfuscator.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 #require 'base64'
 

data/lib/mmtrix/agent/parameter_filtering.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix"s license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/pipe_channel_manager.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'base64'
 

data/lib/mmtrix/agent/pipe_service.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/rules_engine/replacement_rule.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/rules_engine/segment_terms_rule.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/rules_engine.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/rules_engine/replacement_rule'
 require 'mmtrix/agent/rules_engine/segment_terms_rule'

data/lib/mmtrix/agent/sampled_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # This class acts like an Array with a fixed capacity that randomly samples
 # from a stream of items such that the probability of each item being included

data/lib/mmtrix/agent/sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 #
 # A Sampler is used to capture meaningful metrics in a background thread
 # periodically.  They will be invoked about once a minute, each time the agent

data/lib/mmtrix/agent/sampler_collection.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/samplers/cpu_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/sampler'
 

data/lib/mmtrix/agent/samplers/delayed_job_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/sampler'
 require 'mmtrix/delayed_job_injection'

data/lib/mmtrix/agent/samplers/memory_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/sampler'
 

data/lib/mmtrix/agent/samplers/object_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/sampler'
 

data/lib/mmtrix/agent/samplers/vm_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/sampler'
 require 'mmtrix/agent/vm'

data/lib/mmtrix/agent/sized_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/event_buffer'
 

data/lib/mmtrix/agent/sql_sampler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'zlib'
 require 'base64'

data/lib/mmtrix/agent/stats.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 module Mmtrix
   module Agent
     class Stats

data/lib/mmtrix/agent/stats_engine/gc_profiler.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # -*- coding: utf-8 -*-
 module Mmtrix

data/lib/mmtrix/agent/stats_engine/metric_stats.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/language_support'
 

data/lib/mmtrix/agent/stats_engine/samplers.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
 module Agent

data/lib/mmtrix/agent/stats_engine/stats_hash.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # A Hash-like class for storing metric data.
 #

data/lib/mmtrix/agent/stats_engine.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/stats_engine/metric_stats'
 require 'mmtrix/agent/stats_engine/samplers'

data/lib/mmtrix/agent/supported_versions.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/synthetics_event_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/event_buffer'
 require 'mmtrix/agent/sized_buffer'

data/lib/mmtrix/agent/synthetics_monitor.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/inbound_request_monitor'
 

data/lib/mmtrix/agent/system_info.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 # 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 -
@@ -203,8 +203,6 @@ module Mmtrix
       end
 
       # A File.read against /(proc|sysfs)/* can hang with some older Linuxes.
-      # See https://bugzilla.redhat.com/show_bug.cgi?id=604887, RUBY-736, and
-      # https://github.com/opscode/ohai/commit/518d56a6cb7d021b47ed3d691ecf7fba7f74a6a7
       # for details on why we do it this way.
       def self.proc_try_read(path)
         return nil unless File.exist?(path)

data/lib/mmtrix/agent/threading/agent_thread.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/threading/backtrace_node.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/threading/backtrace_service.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/threading/thread_profile.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'set'
 require 'mmtrix/agent/worker_loop'

data/lib/mmtrix/agent/traced_method_stack.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 module Mmtrix
   module Agent

data/lib/mmtrix/agent/transaction/attributes.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/attribute_processing'
 

data/lib/mmtrix/agent/transaction/developer_mode_sample_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/transaction/transaction_sample_buffer'
 

data/lib/mmtrix/agent/transaction/slowest_sample_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/transaction/transaction_sample_buffer'
 

data/lib/mmtrix/agent/transaction/synthetics_sample_buffer.rb

@@ -1,6 +1,6 @@
 # encoding: utf-8
 # This file is distributed under Mmtrix's license terms.
-# See https://github.com/mmtrix/rpm/blob/master/LICENSE for complete details.
+
 
 require 'mmtrix/agent/transaction/transaction_sample_buffer'