oneapm_rpm 1.2.1 → 1.2.2.rc

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NjFkOTNlOTgzYmVlNjAzNGQyNTQzZTVkMTc0ZmRkYzA5OTAwODhmMQ==
+    MTBjNGFlOWYyNDg0OGJmMzQzYTA1YjQzYjIxOGVjMjMyOTg3NjYwMw==
   data.tar.gz: !binary |-
-    ZGJlNDJmMTMwNTVjYzFiMmE2M2IxZmE4ZGU3MTRlOWY1ZDEzZDFmMw==
+    ZTY1NTEyNjRmODllNTJkYjI0ZjU1MDJhYjkwOTdhNzM3ZjI1YmEwZQ==
 SHA512:
   metadata.gz: !binary |-
-    ZTFjMjAyZGMzOGQzOTRjMjlmM2RhNTMxOWE1ODViMTNkNWE5YjAxNDczZWRi
-    MzlkZTk3YzBjNDk1MGRmNmI1NzA5MzJmYTRhN2ZkYmU3ZDc4NmFhMWEyNDcw
-    ZTlhZTVmZmM2YWFlNTRjOGFmNDIxYTliNTk0ZDZhN2Y4ODY0MGU=
+    NGVkZDg2OTA1Y2RjNWQwNzRmZmVhMjAwZTJkYTNjZmQxNGI5N2IxMWQxNDU4
+    M2E5NzlmYjI0ZTNhY2ZmYmQ0YzQ1M2Y3MWJlYTYwOWU4ZGIyOThlMWYxYzcw
+    MDdkYzAzMTI5MTk2ZjFiNGQ5MzY3YmEyMmVjOGU0MDAwNTk2ZDU=
   data.tar.gz: !binary |-
-    NTlmYTk0ZTIxZmQ5OTZhZDljYjgyNGNlNTM4MWFhNGZhMmFmYjZmM2M3YTNh
-    ODA3NjQ4NDM1OWEzYmY5NjNiOTM3YjVkM2NkNmU2MWQ4NmNlMDZiN2NlM2Iz
-    MzY1ZmZhNzA3MTcyZDA4YjI5OTYzYjFkYTcwOGQ1Njc0M2U3YzE=
+    YjBjMmFhYmRlMjI5YTJkNzU3Y2U3NTgwNjY0ODBlNzZjNDBlOWQ5OGY0YTNk
+    ZWIyYTRmZDlmNjRhODQ4NTI1ZDZkMmU2MmE3NGJjYmUzYzIwZjQ0OWY1NjQ5
+    MjM5MmUxN2I2YjRhMGRiZjNlYjE4MjlmN2JlZWE0MWYyMDQ0ZmE=

data/Guardfile

@@ -1,5 +1,6 @@
 guard :minitest, :test_folders => ['test/one_apm'], :all_after_pass => false do
-  watch(%r{^lib/(.+)\.rb$})     { |m| "test/#{m[1]}_test.rb" }
+  watch(%r{^lib\/.*\/(.*)\.rb$}) {|m| Dir["test/one_apm/**/#{m[1]}_test.rb"]}
+  watch(%r{.*suites\/(.+)?\/(.*)_test.rb$}){|m|Guard::UI.info "Change: #{m[1]}: #{m[0]}}"; system("rake test:multiverse[#{m[1]},file=#{m[0]}]") || throw(:task_has_failed) }
   watch(%r{^test/.+_test\.rb$})
   watch('test/test_helper.rb')  { "test/one_apm" }
   watch('test/agent_helper.rb') { "test/one_apm" }

data/lib/one_apm/collector/collector/http_connection.rb

@@ -13,9 +13,6 @@ module OneApm
           data = nil
           begin
             data = @marshaller.dump(payload, options)
-            if method != :connect
-              data = data.gsub(/(Controller|HttpDispatcher)/, "WebTransaction")
-            end
           rescue StandardError, SystemStackError => e
             handle_serialization_error(method, e)
           end

data/lib/one_apm/configuration/default_source.rb

@@ -766,6 +766,13 @@ module OneApm
         :type => Boolean,
         :description => 'Enable or disable HTTPS instrumentation by JavaScript agent on HTTP pages.'
       },
+      :'browser_monitoring.whitelist_ips' => {
+        :default => '',
+        :allow_nil => true,
+        :public => true,
+        :type => String,
+        :description => 'Filter IPs which can be inerted JavaScript agent on HTTP pages.'
+      },
       :'browser_monitoring.is_js_text' => {
         :default => false,
         :public => true,

data/lib/one_apm/rack/browser_monitoring.rb

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 require 'rack'
+require 'ipaddr'
 require 'one_apm/rack/middleware_base'
 require 'one_apm/rack/middleware_wrapper'
 
@@ -9,6 +10,7 @@ module OneApm::Rack
 
     SCAN_LIMIT = 50_000
     ALREADY_INSTRUMENTED_KEY = "oneapm.browser_monitoring_already_instrumented"
+    REMOTE_IP = "action_dispatch.remote_ip"
 
     CHARSET_RE         = /<\s*meta[^>]+charset\s*=[^>]*>/im.freeze
     X_UA_COMPATIBLE_RE = /<\s*meta[^>]+http-equiv\s*=\s*['"]x-ua-compatible['"][^>]*>/im.freeze
@@ -38,7 +40,8 @@ module OneApm::Rack
         !env[ALREADY_INSTRUMENTED_KEY] &&
         is_html?(headers) &&
         !is_attachment?(headers) &&
-        !is_streaming?(env)
+        !is_streaming?(env) && 
+        ip_valid?(env)
     end
 
     def is_html?(headers)
@@ -54,6 +57,28 @@ module OneApm::Rack
       env['action_controller.instance'].class.included_modules.include?(ActionController::Live)
     end
 
+    def ip_valid?(env)
+      whitelist_ips = OneApm::Manager.config[:'browser_monitoring.whitelist_ips']
+      return true if whitelist_ips.empty? || env[REMOTE_IP].to_s.empty?
+      OneApm::Manager.logger.debug "Remote IP: #{env[REMOTE_IP]}"
+      begin
+        client = IPAddr.new(env[REMOTE_IP].to_s).to_i 
+        whitelist_ips.split(",").any? do |ip|
+          low_ip, high_ip = ip.split("-").map(&:strip)
+          low = IPAddr.new(low_ip).to_i
+          if high_ip
+            high = IPAddr.new(high_ip).to_i
+            (low..high) === client
+          else
+            low == client  
+          end
+        end
+      rescue => e
+        OneApm::Manager.logger.error "Configuration for browser_monitoring.whitelist_ips has problems:#{whitelist_ips}"
+        true
+      end
+    end 
+
     def autoinstrument_source(response, headers, js_to_inject)
       source = gather_source(response)
       close_old_response(response)

data/lib/one_apm/transaction/class_methods.rb

@@ -81,7 +81,7 @@ module OneApm
       end
 
       def nested_transaction_name(name)
-        if name.start_with?(Transaction::CONTROLLER_PREFIX) || name.start_with?(Transaction::OTHER_TRANSACTION_PREFIX)
+        if name.start_with?(Transaction::WEB_TRANSACTION_PREFIX) || name.start_with?(Transaction::OTHER_TRANSACTION_PREFIX)
           "#{Transaction::SUBTRANSACTION_PREFIX}#{name}"
         else
           name

data/lib/one_apm/transaction/metric_constants.rb

@@ -7,14 +7,15 @@ module OneApm
     CONTROLLER_PREFIX            = 'Controller/'.freeze
     MIDDLEWARE_PREFIX            = 'Middleware/Rack/'.freeze
     TASK_PREFIX                  = 'OtherTransaction/Background/'.freeze
-    RACK_PREFIX                  = 'Controller/Rack/'.freeze
-    SINATRA_PREFIX               = 'Controller/Sinatra/'.freeze
-    GRAPE_PREFIX                 = 'Controller/Grape/'.freeze
+    RACK_PREFIX                  = 'WebTransaction/Rack/'.freeze
+    SINATRA_PREFIX               = 'WebTransaction/Sinatra/'.freeze
+    GRAPE_PREFIX                 = 'WebTransaction/Grape/'.freeze
     OTHER_TRANSACTION_PREFIX     = 'OtherTransaction/'.freeze
+    WEB_TRANSACTION_PREFIX       = 'WebTransaction/'.freeze
 
     CONTROLLER_MIDDLEWARE_PREFIX = 'Controller/Middleware/Rack'.freeze
 
-    WEB_SUMMARY_METRIC   = 'HttpDispatcher'.freeze
+    WEB_SUMMARY_METRIC   = 'WebTransaction'.freeze
     OTHER_SUMMARY_METRIC = 'OtherTransaction/all'.freeze
 
     APDEX_S = 'S'.freeze

data/lib/one_apm/transaction/transaction_name.rb

@@ -5,11 +5,20 @@ module OneApm
     module TransactionName
 
       def overridden_name=(name)
-        @overridden_name = Helper.correctly_encoded(name)
+        @overridden_name = filter name
       end
 
       def default_name=(name)
-        @default_name = Helper.correctly_encoded(name)
+        @default_name = filter name
+      end
+
+      def frozen_name=(name)
+        @frozen_name = filter name
+      end
+
+      def filter name
+        encoded_name = Helper.correctly_encoded(name)
+        encoded_name ? encoded_name.gsub("Controller", "WebTransaction") : nil
       end
 
       def make_transaction_name(name, category = nil)
@@ -33,7 +42,7 @@ module OneApm
       end
 
       def name_last_frame(name)
-        frame_stack.last.name = name
+        frame_stack.last.name = filter(name)
       end
 
       def log_frozen_name(name)
@@ -56,7 +65,7 @@ module OneApm
 
       def promoted_transaction_name(name)
         if name.start_with?(Transaction::MIDDLEWARE_PREFIX)
-          "#{Transaction::CONTROLLER_PREFIX}#{name}"
+          "#{Transaction::WEB_TRANSACTION_PREFIX}#{name}"
         else
           name
         end
@@ -70,9 +79,9 @@ module OneApm
 
           if name.nil?
             ignore!
-            @frozen_name = best_name
+            self.frozen_name = best_name
           else
-            @frozen_name = name
+            self.frozen_name = name
           end
         end
 

data/lib/one_apm/transaction/transaction_namer.rb

@@ -8,10 +8,10 @@ module OneApm
     def self.prefix_for_category(txn, category = nil)
       category ||= (txn && txn.category)
       case category
-      when :controller then ::OneApm::Transaction::CONTROLLER_PREFIX
+      when :controller then ::OneApm::Transaction::WEB_TRANSACTION_PREFIX
       when :task       then ::OneApm::Transaction::TASK_PREFIX
       when :rack       then ::OneApm::Transaction::RACK_PREFIX
-      when :uri        then ::OneApm::Transaction::CONTROLLER_PREFIX
+      when :uri        then ::OneApm::Transaction::WEB_TRANSACTION_PREFIX
       when :sinatra    then ::OneApm::Transaction::SINATRA_PREFIX
       when :middleware then ::OneApm::Transaction::MIDDLEWARE_PREFIX
       when :grape      then ::OneApm::Transaction::GRAPE_PREFIX

data/lib/one_apm/transaction/transaction_summary.rb

@@ -4,7 +4,7 @@ module OneApm
   class Transaction
 
     def summary_metrics
-      if @frozen_name.start_with?(CONTROLLER_PREFIX)
+      if @frozen_name.start_with?(WEB_TRANSACTION_PREFIX)
         [WEB_SUMMARY_METRIC]
       else
         background_summary_metrics

data/lib/one_apm/version.rb

@@ -5,9 +5,10 @@ module OneApm
 
     MAJOR = 1
     MINOR = 2
-    TINY  = 1
+    TINY  = 2
+    TAG   = 'rc'
 
-    STRING = [MAJOR, MINOR, TINY].compact.join('.')
+    STRING = [MAJOR, MINOR, TINY, TAG].compact.join('.')
 
   end
 end

data/oneapm_rpm.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'minitest', '~> 4.7'
   s.add_development_dependency 'minitest-ci', '= 2.4.0'
   s.add_development_dependency 'minitest-focus', '~> 1.1'
+  s.add_development_dependency 'minitest-reporters', '0.14.24'
   s.add_development_dependency 'simplecov', '= 0.10.0'
   s.add_development_dependency 'mocha', '~> 0.13.0'
   s.add_development_dependency 'rails', '~> 3.2'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2.rc
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-15 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -66,6 +66,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: minitest-reporters
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.24
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.14.24
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement