oneapm_rpm 1.3.7 → 1.4.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDVlMTljZWZkZjdmMmY1YjU0NTZjMGJiYzZlYjMzY2Q0ZDI3NDNiZA==
-  data.tar.gz: !binary |-
-    ZGNhNmQ5MTE0MzRlNDAxMmU4MzhlMjM1MzVlMjNhYTA2YzA4ZDg5MQ==
+SHA1:
+  metadata.gz: 29db414eace791ea99e84e88736a5d88fd052479
+  data.tar.gz: 9135f6c1b0ffc0f46cf4a282df144dd5a24b7d16
 SHA512:
-  metadata.gz: !binary |-
-    MzJjNTIwNGYxYzdkOWQzODRhOWI3OWI2NDhlNzJmNGNlYmNlZjg2ZTc4YjZk
-    MWU0OTBmMTYyNDI4ZGUyZWM3Njg0YjEyNmU2OTdjNTYxZjZlNTY0YTYxOGJh
-    ZmJiMzEyY2VhOTRlMzY3NDUwOTJkMTk4YmI3ZTI2NzI5YTA0ZDg=
-  data.tar.gz: !binary |-
-    ZWU1NjhjZDU3YWU4ODRlMzliNGRmOTM3ZTljNTdhNDc1OWE3OWI4MDVkNTZl
-    MzU5MDZjZDY4MTUxNTg0YjhmYTgxY2FmNTU5ZmU2NjE1MmY4NzE1NmJkMzVl
-    NGM3NTMzZDg5M2Q1NWE0Mjk0Y2RkOTIyZWI4OTE0NzhjMjk2Yjc=
+  metadata.gz: 462dd17fc6fb7921d4792533fcf2b551378bf291671febc63257e22478423deb02277458ce401c1d2b37ba880256c19531b00a9c8b7e9751389006105a792628
+  data.tar.gz: 42f6a0d49c6333bd0dc81ae498d89de3c0ddd31bbafa1e22047ad3690fc6ec4523efaeb37e4acf257b82b732f4ca1d106f773b07d477841cc2f87299e0e46bc3

data/.gitignore

@@ -30,5 +30,6 @@ test/performance/script/log/
 /test/reports/*
 .ruby-version
 .ruby-gemset
-**/database.yml
-test/multiverse/suites/active_record/config/database.yml
+/.tags
+/.tags_sorted_by_file
+/**/database.yml

data/Gemfile

@@ -1,3 +1,3 @@
-source 'http://rubygems.org'
+source 'https://rubygems.org'
 
 gemspec

data/lib/one_apm/agent.rb

@@ -11,6 +11,7 @@ require 'one_apm/support/event_buffer/sampled_buffer'
 require 'one_apm/agent/harvester'
 
 require 'one_apm/support/hostname'
+require 'one_apm/support/ip'
 require 'one_apm/support/environment_report'
 
 require 'one_apm/configuration'
@@ -40,6 +41,8 @@ require 'one_apm/agent/agent/container_data_manager'
 require 'one_apm/agent/agent/forkable_dispatcher_functions'
 require 'one_apm/agent/agent/restart_monitor'
 require 'one_apm/agent/agent/restart'
+require 'one_apm/agent/agent/cross_app_samples_sender'
+require 'one_apm/agent/agent/rule_fetcher'
 
 module OneApm
   module Agent
@@ -50,6 +53,7 @@ module OneApm
       include OneApm::Agent::Agent::Helpers
       include OneApm::Agent::Agent::ContainerDataManager
       include OneApm::Agent::Agent::ForkableDispatcherFunctions
+      include OneApm::Agent::Agent::RuleFetcher
 
       attr_reader :record_sql
       attr_reader :javascript_instrumentor
@@ -63,6 +67,7 @@ module OneApm
       attr_reader :events
 
       attr_reader :transaction_rules
+      attr_accessor :external_rename_rules
 
       attr_reader :harvester
       attr_reader :harvest_samplers
@@ -83,16 +88,18 @@ module OneApm
 
         @events = OneApm::Support::EventListener.new
 
-        init_containers @events
+        init_containers
+        
         OneApm::Agent::SyntheticsMonitor.new @events
         OneApm::Agent::RestartMonitor.new
 
-        @cross_app_monitor       = OneApm::Agent::CrossAppMonitor.new(@events)
-        @transaction_rules       = OneApm::Support::RulesEngine.new
-        @harvest_samplers        = OneApm::Collector::SamplerCollection.new(@events)
-        @monotonic_gc_profiler   = OneApm::Support::VM::MonotonicGCProfiler.new
-        @javascript_instrumentor = OneApm::Agent::JavascriptInstrumentor.new(@events)
-        @restart                 = OneApm::Agent::Restart.new(@events)
+        @cross_app_monitor        = OneApm::Agent::CrossAppMonitor.new(@events)
+        @transaction_rules        = OneApm::Support::RulesEngine.new
+        @harvest_samplers         = OneApm::Collector::SamplerCollection.new(@events)
+        @monotonic_gc_profiler    = OneApm::Support::VM::MonotonicGCProfiler.new
+        @javascript_instrumentor  = OneApm::Agent::JavascriptInstrumentor.new(@events)
+        @restart                  = OneApm::Agent::Restart.new(@events)
+        @cross_app_samples_sender = OneApm::Agent::CrossAppSamplesSender.new(@events, self)
 
         @harvester       = OneApm::Agent::Harvester.new(@events)
         @after_fork_lock = Mutex.new
@@ -140,9 +147,9 @@ module OneApm
 
       def agent_should_start?
         return false if already_started? || disabled? || defer_for_background_jobs?
-
-        unless app_name_configured?
-          OneApm::Manager.logger.error "No application name configured in #{probe.env} environment"
+        
+        unless app_name_configured? && tier_name_configured?
+          OneApm::Manager.logger.error "No application name or tier name configured in #{probe.env} environment"
           false
         else
           true

data/lib/one_apm/agent/agent/connect.rb

@@ -68,14 +68,16 @@ module OneApm
           {
             :pid => $$,
             :host => local_host,
-            :app_name => OneApm::Manager.config.app_names,
+            :tier_name => OneApm::Manager.config.tier_names,
+            :app_name => OneApm::Manager.config.app_name,
             :language => 'ruby',
             :labels => OneApm::Manager.config.parsed_labels,
             :agent_version => OneApm::VERSION::STRING,
             :environment => @environment_report,
             :settings => OneApm::Manager.config.to_notified_hash,
             :high_security => OneApm::Manager.config[:high_security],
-            :identifier => "ruby:#{local_host}"
+            :identifier => "ruby:#{local_host}",
+            :clientIP => client_ip
           }
         end
 
@@ -95,7 +97,6 @@ module OneApm
           return if config_data == nil
 
           @service.agent_id = config_data['agent_run_id'] if @service
-
           OneApm::Manager.logger.debug "Server provided config: #{config_data.inspect}"
           server_config = OneApm::Configuration::ServerSource.new(config_data, OneApm::Manager.config)
           OneApm::Manager.config.update_config(server_config)
@@ -103,12 +104,17 @@ module OneApm
 
           @transaction_rules = OneApm::Support::RulesEngine.create_transaction_rules(config_data)
           @stats_engine.metric_rules = OneApm::Support::RulesEngine.create_metric_rules(config_data)
+          @external_rename_rules = OneApm::Support::RenameRulesEngine.create_or_update_external_rules(config_data)
         end
 
         def local_host
           @local_host ||= OneApm::Agent::Hostname.get
         end
 
+        def client_ip
+          @ip ||= OneApm::Agent::IP.get
+        end
+
         def log_connection!(config_data)
           OneApm::Manager.logger.debug "Connected to OneApm Service at #{@service.collector.name}"
           OneApm::Manager.logger.debug "Agent Run       = #{@service.agent_id}."

data/lib/one_apm/agent/agent/container_data_manager.rb

@@ -11,6 +11,7 @@ module OneApm
         attr_reader :agent_command_router
         attr_reader :error_collector
         attr_reader :custom_event_aggregator
+        attr_reader :transaction_event_aggregator
 
         def merge_data_for_endpoint(endpoint, data)
           if data && !data.empty?
@@ -31,9 +32,9 @@ module OneApm
 
         private
 
-        def init_containers(events)
+        def init_containers
           @stats_engine                 = OneApm::Collector::StatsEngine.new
-          @transaction_sampler          = OneApm::Collector::TransactionSampler.new
+          @transaction_sampler          = OneApm::Collector::TransactionSampler.new(@events)
           @sql_sampler                  = OneApm::Collector::SqlSampler.new
           @error_collector              = OneApm::Collector::ErrorCollector.new
           @custom_event_aggregator      = OneApm::Collector::CustomEventAggregator.new
@@ -145,6 +146,10 @@ module OneApm
           @events.notify(:agent_restart) if OneApm::Agent::RestartMonitor.need_restart?
         end
 
+        def reset_cross_app_sampler_counter
+          transaction_sampler.cross_sample_buffer.reset_counter!
+        end
+
         def transmit_event_data
           transmit_single_data_type(:harvest_and_send_analytic_event_data, "TransactionEvent")
         end
@@ -182,6 +187,7 @@ module OneApm
             harvest_and_send_timeslice_data
 
             check_for_and_handle_agent_commands
+            check_for_match_rules
             harvest_and_send_for_agent_commands
           end
         ensure
@@ -202,12 +208,23 @@ module OneApm
           end
         end
 
+        def check_for_match_rules
+          begin
+            @agent_command_router.check_for_and_handle_agent_commands
+          rescue ForceRestartException, ForceDisconnectException
+            raise
+          rescue ServerConnectionException => e
+            log_remote_unavailable(:get_agent_commands, e)
+          rescue => e
+            OneApm::Manager.logger.info("Error during check_for_and_handle_agent_commands, will retry later: ", e)
+          end
+        end
+
         def log_remote_unavailable(endpoint, e)
           OneApm::Manager.logger.debug("Unable to send #{endpoint} data, will try again later. Error: ", e)
           OneApm::Manager.record_metric("Supportability/remote_unavailable", 0.0)
           OneApm::Manager.record_metric("Supportability/remote_unavailable/#{endpoint.to_s}", 0.0)
         end
-
       end
     end
   end

data/lib/one_apm/agent/agent/cross_app_samples_sender.rb

@@ -0,0 +1,22 @@
+# encoding: utf-8
+
+module OneApm
+  module Agent
+    class CrossAppSamplesSender
+
+      # this class should be abandoned
+      def initialize(events, agent)
+        # @agent = agent
+        # events.subscribe(:cross_sample_buffer_added, &method(:send_sample))
+      end
+
+      def send_sample(sample)
+        # OneApm::Manager.logger.debug "Send Cross App samples..."
+        # @agent.harvest_lock.synchronize do
+        #   @agent.service.transaction_sample_data([sample])
+        # end
+        # OneApm::Manager.logger.debug "Send Cross App samples successful."
+      end
+    end
+  end
+end

data/lib/one_apm/agent/agent/rule_fetcher.rb

@@ -0,0 +1,15 @@
+# encoding: utf-8
+require 'one_apm/support/rename_rules_engine'
+module OneApm
+  module Agent
+    class Agent
+      module RuleFetcher
+
+        def update_rule
+          OneApm::Support::RenameRulesEngine.create_or_update_external_rules(@service.fetch_config)
+        end
+
+      end
+    end
+  end
+end

data/lib/one_apm/agent/agent/start.rb

@@ -75,8 +75,14 @@ module OneApm
 
         # Logs the configured application names
         def app_name_configured?
-          names = OneApm::Manager.config.app_names
-          return names.respond_to?(:any?) && names.any?
+          app_name = OneApm::Manager.config.app_name
+          return app_name.respond_to?(:empty?) && !app_name.empty?
+        end
+
+          # Logs the configured application tier names
+        def tier_name_configured?
+          tier_names = OneApm::Manager.config.tier_names
+          return tier_names.respond_to?(:any?) && tier_names.any?
         end
 
         # Connecting in the foreground blocks further startup of the
@@ -181,6 +187,7 @@ module OneApm
           log_environment
           log_dispatcher
           log_app_name
+          log_tier_name
         end
 
         # Classy logging of the agent version and the current pid,
@@ -210,9 +217,14 @@ module OneApm
         end
 
         def log_app_name
-          OneApm::Manager.logger.info "Application: #{Manager.config.app_names.join(", ")}"
+          OneApm::Manager.logger.info "Application: #{Manager.config.app_name}"
         end
 
+        def log_tier_name
+          OneApm::Manager.logger.info "Tiername: #{Manager.config.tier_names.join(", ")}"
+        end
+
+
         def log_ignore_url_regexes
           regexes = OneApm::Manager.config[:'rules.ignore_url_regexes']
 

data/lib/one_apm/agent/agent/start_worker_thread.rb

@@ -41,11 +41,17 @@ module OneApm
           @event_loop.on(:report_event_data)    { transmit_event_data }
           @event_loop.on(:reset_log_once_keys)  { OneApm::Manager.logger.clear_already_logged }
           @event_loop.on(:detect_config)        { detect_config }
+          @event_loop.on(:reset_counter)        { reset_cross_app_sampler_counter }
+          @event_loop.on(:update_rule)          { update_rule }
+
 
           @event_loop.fire_every(Manager.config[:data_report_period],       :report_data)
-          @event_loop.fire_every(report_period_for(:analytic_event_data), :report_event_data)
-          @event_loop.fire_every(OA_LOG_ONCE_KEYS_RESET_PERIOD,              :reset_log_once_keys)
+          @event_loop.fire_every(report_period_for(:analytic_event_data),   :report_event_data)
+          @event_loop.fire_every(OA_LOG_ONCE_KEYS_RESET_PERIOD,             :reset_log_once_keys)
           @event_loop.fire_every(Manager.config[:data_report_period],       :detect_config)
+          @event_loop.fire_every(Manager.config[:data_report_period],       :reset_counter)
+          @event_loop.fire_every(Manager.config[:update_rule_period],       :update_rule)
+
 
           if OneApm::Manager.config[:collect_utilization] && !in_resque_child_process?
             @event_loop.on(:report_utilization_data) { transmit_utilization_data }

data/lib/one_apm/agent/cross_app/cross_app_monitor.rb

@@ -10,14 +10,15 @@ module OneApm
   module Agent
     class CrossAppMonitor < InboundRequestMonitor
 
-      ONEAPM_ID_HEADER      = 'X-OneApm-ID'
-      ONEAPM_TXN_HEADER     = 'X-OneApm-Transaction'
-      ONEAPM_APPDATA_HEADER = 'X-OneApm-App-Data'
+      ONEAPM_ID_HEADER      = 'X-BlueWare-ID'
+      ONEAPM_TXN_HEADER     = 'X-BlueWare-Transaction'
+      ONEAPM_APPDATA_HEADER = 'X-BlueWare-App-Data'
 
-      ONEAPM_ID_HEADER_KEY      = 'HTTP_X_ONEAPM_ID'.freeze
-      ONEAPM_TXN_HEADER_KEY     = 'HTTP_X_ONEAPM_TRANSACTION'.freeze
+      ONEAPM_ID_HEADER_KEY      = 'HTTP_X_BLUEWARE_ID'.freeze
+      ONEAPM_TXN_HEADER_KEY     = 'HTTP_X_BLUEWARE_TRANSACTION'.freeze
       OA_CONTENT_LENGTH_HEADER_KEY = 'HTTP_CONTENT_LENGTH'.freeze
 
+
       def on_finished_configuring(events)
         register_event_listeners(events)
       end
@@ -172,7 +173,7 @@ module OneApm
 
       def path_hash(txn_name, seed)
         rotated    = ((seed << 1) | (seed >> 31)) & 0xffffffff
-        app_name   = OneApm::Manager.config.app_names.first
+        app_name   = OneApm::Manager.config.app_name
         identifier = "#{app_name};#{txn_name}"
         sprintf("%08x", rotated ^ hash_transaction_name(identifier))
       end

data/lib/one_apm/agent/cross_app/cross_app_tracing.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require 'one_apm/agent/cross_app/cross_app_tracing_message'
+
 module OneApm
   module Agent
     module CrossAppTracing
@@ -8,16 +10,16 @@ module OneApm
       class Error < RuntimeError; end
 
       # The cross app response header for "outgoing" calls
-      OA_APPDATA_HEADER = 'X-OneApm-App-Data'
+      OA_APPDATA_HEADER = 'X-BlueWare-App-Data'
 
       # The cross app id header for "outgoing" calls
-      OA_ID_HEADER = 'X-OneApm-ID'
+      OA_ID_HEADER = 'X-BlueWare-ID'
 
       # The cross app transaction header for "outgoing" calls
-      OA_TXN_HEADER = 'X-OneApm-Transaction'
+      OA_TXN_HEADER = 'X-BlueWare-Transaction'
 
       # The cross app synthetics header
-      OA_SYNTHETICS_HEADER = 'X-OneApm-Synthetics'
+      OA_SYNTHETICS_HEADER = 'X-BlueWare-Synthetics'
 
       # The index of the transaction GUID in the appdata header of responses
       OA_APPDATA_TXN_GUID_INDEX = 5
@@ -36,6 +38,7 @@ module OneApm
       def tl_trace_http_request(request)
         state = OneApm::TransactionState.tl_get
         return yield unless state.is_execution_traced?
+        return yield if request['_SKIP_CAT_']
 
         # It's important to set t0 outside the ensured block, otherwise there's
         # a race condition if we raise after begin but before t0's set.
@@ -108,7 +111,7 @@ module OneApm
             metrics = metrics_for(request, response)
             scoped_metric = metrics.pop
 
-            stats_engine.record_scoped_and_unscoped_metrics(state, scoped_metric, metrics, duration, nil, &cross_app_run_time_block(response, duration))
+            #stats_engine.record_scoped_and_unscoped_metrics(state, scoped_metric, metrics, duration, nil, &cross_app_run_time_block(response, duration))
            
             # If we don't have segment, something failed during start_trace so
             # the current segment isn't the HTTP call it should have been.
@@ -116,6 +119,23 @@ module OneApm
               segment.name = scoped_metric
               add_transaction_trace_parameters(request, response)
             end
+            payload = {
+                :name                            => name(request) ,
+                :scope                           => state.current_transaction.frozen_name,
+                :apdex_perf_zone                 => 'S',
+                :guid                            => OneApm::Helper.generate_guid,
+                :duration                        => duration,
+                :referring_transaction_guid      => state.current_transaction.guid,
+                :call_count                      => 1,
+                :start_timestamp                 => t0.to_f,
+                :request_url                     => request.uri,
+                :bytes_sent                      => 0,
+                :bytes_rec                       => 0,
+                :has_trace                       => 0,
+                :exec_time                       => duration,
+                :call_type                       => 0
+            }
+            transaction_event_aggregator.on_cross_app_transaction_finished(payload)
           end
         ensure
           # If we have a segment, always pop the traced method stack to avoid
@@ -131,6 +151,10 @@ module OneApm
         OneApm::Manager.logger.error "Uncaught exception while finishing an HTTP request trace", err
       end
 
+      def name(request)
+        external_rename_rules.rename(request)
+      end
+
       # Return +true+ if cross app tracing is enabled in the config.
       def cross_app_enabled?
         valid_cross_process_id? &&
@@ -165,19 +189,19 @@ module OneApm
       def inject_request_headers(state, request)
         cross_app_id = OneApm::Manager.config[:cross_process_id] or
           raise OneApm::Agent::CrossAppTracing::Error, "no cross app ID configured"
-
         state.is_cross_app_caller = true
         txn_guid = state.request_guid
         txn = state.current_transaction
         if txn
           trip_id   = txn.cat_trip_id(state)
           path_hash = txn.cat_path_hash(state)
+          request_host = request.host if request && request.respond_to?(:host)
 
           if txn.raw_synthetics_header
             request[OA_SYNTHETICS_HEADER] = txn.raw_synthetics_header
           end
         end
-        txn_data  = OneApm::JSONWrapper.dump([txn_guid, false, trip_id, path_hash])
+        txn_data  = OneApm::JSONWrapper.dump([txn_guid, true, trip_id, path_hash, request_host])
 
         request[OA_ID_HEADER]  = obfuscator.obfuscate(cross_app_id)
         request[OA_TXN_HEADER] = obfuscator.obfuscate(txn_data)
@@ -194,7 +218,6 @@ module OneApm
         end
       end
 
-
       # Extract any custom parameters from +response+ if it's cross-application and
       # add them to the current TT node.
       def add_cat_transaction_trace_parameters( response )
@@ -260,7 +283,6 @@ module OneApm
       # +response+.
       def metrics_for_crossapp_response( request, response )
         xp_id, txn_name, _q_time, _r_time, _req_len, _ = extract_appdata( response )
-
         check_crossapp_id( xp_id )
         check_transaction_name( txn_name )
 
@@ -315,6 +337,14 @@ module OneApm
         OneApm::Manager.agent.transaction_sampler
       end
 
+      def transaction_event_aggregator
+        OneApm::Manager.agent.transaction_event_aggregator
+      end
+
+      def external_rename_rules
+        OneApm::Manager.agent.external_rename_rules
+      end
+
       # Check the given +id+ to ensure it conforms to the format of a cross-application
       # ID. Raises an OneApm::Agent::CrossAppTracing::Error if it doesn't.
       def check_crossapp_id( id )
@@ -323,6 +353,12 @@ module OneApm
             "malformed cross application ID %p" % [ id ]
       end
 
+      def check_cross_tier_id( id )
+        id =~ /\A\d+#\d+#\d+\z/ or
+          raise OneApm::Agent::CrossAppTracing::Error,
+            "malformed cross application ID %p" % [ id ]
+      end
+
 
       # Check the given +name+ to ensure it conforms to the format of a valid transaction
       # name.