tingyun_rpm 1.1.4.2 → 1.2.0

data/lib/ting_yun/support/coerce.rb

@@ -12,6 +12,7 @@ module TingYun
     module Coerce
       module_function
 
+
       def int(value, context=nil)
         Integer(value)
       rescue => error

data/lib/ting_yun/support/exception.rb

@@ -6,36 +6,11 @@
 module TingYun
   module Support
     module Exception
-      # An exception that is thrown by the server if the agent license is invalid.
-      class LicenseException < StandardError;
-      end
-
-      # An exception that is thrown by the agent, if server['nbs.agent_enable']==false.
-      class AgentEnableException <StandardError;
-      end
 
       # An exception that is thrown by the server, drop the data.
       class UnKnownServerException < StandardError;
       end
 
-      # An exception that forces an agent to stop reporting until its mongrel is restarted.
-      class ForceDisconnectException < StandardError;
-      end
-
-      # An exception that forces an agent to restart.
-      class ForceRestartException < StandardError;
-      end
-
-      # An exception that forces an agent to restart.
-      class InvalidDataException < StandardError;
-      end
-
-      class ExpiredConfigurationException < StandardError;
-      end
-
-      # An exception that forces an agent to restart initAgentApp.
-      class InvalidDataTokenException < StandardError;
-      end
       # Used to blow out of a periodic task without logging a an error, such as for routine
       # failures.
       class ServerConnectionException < StandardError;
@@ -54,15 +29,8 @@ module TingYun
       class SerializationError < StandardError;
       end
 
-      class BackgroundLoadingError < StandardError;
-      end
-
-      class UnsupportedMediaType < StandardError
-      end
-      # Used to wrap errors reported to agent by the collector
-      class CollectorError < StandardError;
+      class AppSessionKeyError < StandardError;
       end
-
       #This is the base class for all errors that we want to record , It provides the
       # standard support text at the front of the message, and is used for flagging
       # agent errors when checking queue limits.
@@ -74,6 +42,7 @@ module TingYun
 
       class InternalServerError < StandardError
       end
+
     end
   end
 end

data/lib/ting_yun/support/local_environment.rb

@@ -23,7 +23,7 @@ module TingYun
 
       # Runs through all the objects in ObjectSpace to find the first one that
       # match the provided class
-      def find_class_in_object_space(klass)
+      def self.find_class_in_object_space(klass)
         if TingYun::Support::LanguageSupport.object_space_usable?
           ObjectSpace.each_object(klass) do |x|
             return x
@@ -53,7 +53,7 @@ module TingYun
         rainbows
         unicorn
       ]
-        while dispatchers.any? && @discovered_dispatcher.nil?
+        while dispatchers.any? && !@discovered_dispatcher
           send 'check_for_'+(dispatchers.shift)
         end
       end
@@ -100,20 +100,20 @@ module TingYun
 
       def check_for_unicorn
         if (defined?(::Unicorn) && defined?(::Unicorn::HttpServer)) && TingYun::Support::LanguageSupport.object_space_usable?
-          v = find_class_in_object_space(::Unicorn::HttpServer)
-          @discovered_dispatcher = :unicorn if v
+          _v = TingYun::Support::LocalEnvironment.find_class_in_object_space(::Unicorn::HttpServer)
+          @discovered_dispatcher = :unicorn if _v
         end
       end
 
       def check_for_rainbows
         if (defined?(::Rainbows) && defined?(::Rainbows::HttpServer)) && TingYun::Support::LanguageSupport.object_space_usable?
-          v = find_class_in_object_space(::Rainbows::HttpServer)
-          @discovered_dispatcher = :rainbows if v
+          _v = TingYun::Support::LocalEnvironment.find_class_in_object_space(::Rainbows::HttpServer)
+          @discovered_dispatcher = :rainbows if _v
         end
       end
 
       def check_for_puma
-        if defined?(::Puma) && File.basename($0) == 'puma'
+        if defined?(::Puma) && $0.include?('puma')
           @discovered_dispatcher = :puma
         end
       end

data/lib/ting_yun/support/serialize/marshaller.rb

@@ -7,21 +7,6 @@ module TingYun
   module Support
     module Serialize
       class Marshaller
-        def parsed_error(error)
-          error_code = error['errorCode']
-          error_message = error['errorMessage']
-          case error_code
-            when 460
-              raise TingYun::Support::Exception::LicenseException.new("#{error_code}: #{error_message}")
-            when 461
-              raise TingYun::Support::Exception::InvalidDataTokenException.new("#{error_code}: #{error_message}")
-            when 462
-              raise TingYun::Support::Exception::InvalidDataException.new("#{error_code}: #{error_message}")
-            when 470
-              raise TingYun::Support::Exception::ExpiredConfigurationException.new("#{error_code}: #{error_message}")
-          end
-        end
-
         def prepare(data, options={})
           encoder = options[:encoder] || default_encoder
           if data.respond_to?(:to_collector_array)
@@ -50,18 +35,15 @@ module TingYun
         protected
 
         def return_value(data)
-          if data.respond_to?(:has_key?)
-            if data.has_key?('status') && data.has_key?('result')
-              if data['status'] =="error"
-                parsed_error(data['result'])
-              elsif data['result']['enabled'] == false
-                raise TingYun::Support::Exception::AgentEnableException.new("sorry，the application is unable to use the tingyun service now ")
-              else
-                return data['result']
-              end
+          if data.respond_to?(:has_key?) && data.has_key?('status') 
+            if data['status'] =="error"
+              raise TingYun::Support::Exception::UnKnownServerException.new("sorry，the application is unable to use the tingyun service now, we should reconnect again ")
+            else
+              return data['result']
             end
+          else
+            raise TingYun::Support::Exception::UnKnownServerException.new("sorry，the application is unable to use the tingyun service now, we should reconnect again ")
           end
-          data
         end
       end
     end

data/lib/ting_yun/ting_yun_service.rb

@@ -31,11 +31,11 @@ module TingYun
                   :ssl_cert_store,
                   :shared_tcp_connection
 
-    def initialize(license_key=nil,collector=TingYun::Support.collector)
+
+    def initialize(license_key=nil)
 
       @license_key = license_key || TingYun::Agent.config[:'license_key']
       @request_timeout = TingYun::Agent.config[:timeout]
-      @collector = collector
       @data_version = TingYun::VERSION::STRING
       @marshaller =TingYun::Support::Serialize::JsonMarshaller.new
       @metric_id_cache = {}
@@ -53,6 +53,7 @@ module TingYun
     end
 
     def get_redirect_host
+      @collector=TingYun::Support.collector
       invoke_remote(:getRedirectHost)
     end
 
@@ -81,25 +82,23 @@ module TingYun
         handle_serialization_error(method, e)
       end
       # serialize_finish_time = Time.now
+      uri = remote_method_uri(method)
+      full_uri = "#{@collector}#{uri}"
 
-      if TingYun::Agent.config[:'nbs.audit_mode']
-        TingYun::Agent.logger.info("the prepare data: #{data}")
+      if audit_mode?
+        TingYun::Agent.logger.info("the prepare data: #{data} to url: #{full_uri}")
       else
         TingYun::Agent.logger.info("prepare to send data")
       end
 
       data, encoding = compress_request_if_needed(data)
-      # size = data.size
 
-      uri = remote_method_uri(method)
-      full_uri = "#{@collector}#{uri}"
-      TingYun::Agent.logger.info("url: #{full_uri}") if TingYun::Agent.config[:'nbs.audit_mode']
       response = send_request(:data      => data,
                               :uri       => uri,
                               :encoding  => encoding,
                               :collector => @collector)
 
-      if TingYun::Agent.config[:'nbs.audit_mode']
+      if audit_mode?
         TingYun::Agent.logger.info("the return data: #{response.body}")
       else
         TingYun::Agent.logger.info("the send-process end")
@@ -111,6 +110,10 @@ module TingYun
       data = nil
     end
 
+    def audit_mode?
+      TingYun::Agent.config[:'nbs.audit_mode']
+    end
+
     def handle_serialization_error(method, e)
       msg = "Failed to serialize #{method} data using #{@marshaller.class.to_s}: #{e.inspect}"
       error = TingYun::Support::Exception::SerializationError.new(msg)

data/lib/ting_yun/ting_yun_service/connection.rb

@@ -8,6 +8,9 @@ module TingYun
       # Return a Net::HTTP connection object to make a call to the collector.
       # We'll reuse the same handle for cases where we're using keep-alive, or
       # otherwise create a new one.
+
+
+
       def http_connection
         if @in_session
           establish_shared_connection

data/lib/ting_yun/ting_yun_service/http.rb

@@ -7,6 +7,7 @@ require 'net/http'
 require 'ting_yun/ting_yun_service/ssl'
 require 'ting_yun/ting_yun_service/request'
 require 'ting_yun/ting_yun_service/connection'
+require 'ting_yun/support/exception'
 
 module TingYun
   class TingYunService
@@ -18,7 +19,9 @@ module TingYun
 
       def remote_method_uri(method)
         params = {'licenseKey'=> @license_key,'version' => @data_version}
-        params[:appSessionKey] = @appSessionKey if @appSessionKey
+        raise ::TingYun::Support::Exception::AppSessionKeyError.new("@appSessionKey is asked when the upload-method happen") if method==:upload && @appSessionKey.nil?
+        params[:appSessionKey] = @appSessionKey
+
         uri = "/" + method.to_s
         uri << '?' + params.map do |k,v|
           next unless v

data/lib/ting_yun/ting_yun_service/request.rb

@@ -33,18 +33,9 @@ module TingYun
         end
         TingYun::Agent.logger.debug "Received response, status: #{response.code}, encoding: '#{response['content-encoding']}'"
 
-
         case response
           when Net::HTTPSuccess
             true # do nothing
-          when Net::HTTPServiceUnavailable
-            raise TingYun::Support::Exception::ServerConnectionException, "Service unavailable (#{response.code}): #{response.message}"
-          when Net::HTTPGatewayTimeOut
-            raise TingYun::Support::Exception::ServerConnectionException, "Gateway timeout (#{response.code}): #{response.message}"
-          when Net::HTTPRequestEntityTooLarge
-            raise TingYun::Support::Exception::UnrecoverableServerException, '413 Request Entity Too Large'
-          when Net::HTTPUnsupportedMediaType
-            raise TingYun::Support::Exception::UnsupportedMediaType, '415 Unsupported Media Type'
           else
             raise TingYun::Support::Exception::ServerConnectionException, "Unexpected response from server (#{response.code}): #{response.message}"
         end
@@ -64,8 +55,9 @@ module TingYun
       end
 
       def check_post_size(post)
-        return if post.size < TingYun::Agent.config[:post_size_limit]
-        TingYun::Agent.logger.debug "Tried to send too much data: #{post.size} bytes"
+        size = post.size
+        return if size < TingYun::Agent.config[:post_size_limit]
+        TingYun::Agent.logger.debug "Tried to send too much data: #{size} bytes"
         raise TingYun::Support::Exception::UnrecoverableServerException.new('413 Request Entity Too Large')
       end
 
@@ -81,8 +73,8 @@ module TingYun
       def valid_to_marshal?(data)
         @marshaller.dump(data)
         true
-      rescue StandardError, SystemStackError => e
-        TingYun::Agent.logger.warn("Unable to marshal environment report on connect.", e)
+      rescue StandardError, SystemStackError => error
+        TingYun::Agent.logger.warn("Unable to marshal environment report on connect.", error)
         false
       end
     end

data/lib/ting_yun/ting_yun_service/upload_service.rb

@@ -22,15 +22,12 @@ module TingYun
 
       def metric_data(stats_hash)
 
-        timeslice_start = stats_hash.started_at
-        timeslice_end = stats_hash.harvested_at || Time.now
-
         action_array, adpex_array, general_array, components_array, errors_array = build_metric_data_array(stats_hash)
 
         upload_data = {
             :type => 'perfMetrics',
-            :timeFrom => timeslice_start.to_i,
-            :timeTo => timeslice_end.to_i,
+            :timeFrom => stats_hash.started_at.to_i,
+            :timeTo => stats_hash.harvested_at.to_i || Time.now.to_i,
             :interval => 60,
             :actions => action_array,
             :apdex => adpex_array,
@@ -43,9 +40,10 @@ module TingYun
         result
       end
 
+
       # The collector wants to recieve metric data in a format that's different
-      # from how we store it inte -nally, so this method handles the translation.
-      # It also handles translating metric names to IDs using our metric ID cache.
+      # # from how we store it inte -nally, so this method handles the translation.
+      # # It also handles translating metric names to IDs using our metric ID cache.
       def build_metric_data_array(stats_hash)
         action_array = []
         adpex_array = []

data/lib/ting_yun/version.rb

@@ -6,14 +6,12 @@ module TingYun
 
     MAJOR = 1
 
-    MINOR = 1
+    MINOR = 2
 
-    TINY = 4
+    TINY = 0
 
-    BETA = 2
 
 
-    STRING = [MAJOR, MINOR, TINY, BETA].compact.join('.')
-
+    STRING = [MAJOR, MINOR, TINY].compact.join('.')
   end
 end

data/lib/tingyun_rpm.rb

@@ -23,28 +23,30 @@
 
 require 'ting_yun/frameworks'
 
-
+# require 'pry'
 #if the agent had started in manual , then shouldn't start in auto again
 
+
 if defined?(Rails::VERSION)
   if Rails::VERSION::MAJOR.to_i >= 3
     module TingYun
       class Railtie < Rails::Railtie
 
-        initializer "tingyun_rpm.start_plugin" do |app|
-            TingYun::Agent.logger.info('initialize tingyun_rpm start_plugin')
-            TingYun::Frameworks.init_start(:config => app.config)
-        end
+          initializer "tingyun_rpm.start_plugin" do |app|
+              TingYun::Agent.logger.info('initialize tingyun_rpm start_plugin')
+              TingYun::Frameworks.init_start(:config => app.config)
+          end
       end
     end
   else
-    # After version 2.0 of Rails we can access the configuration directly.
-    # We need it to add dev mode routes after initialization finished.
-    config = nil
-    config = Rails.configuration if Rails.respond_to?(:configuration)
-    TingYun::Frameworks.init_start(:config => config)
+      # After version 2.0 of Rails we can access the configuration directly.
+      # We need it to add dev mode routes after initialization finished.
+      config = nil
+      config = Rails.configuration if Rails.respond_to?(:configuration)
+      TingYun::Frameworks.init_start(:config => config)
   end
 else
   TingYun::Frameworks.init_start
 end
 
+

data/tingyun_rpm.gemspec

@@ -36,11 +36,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'pry', '~> 0.9.12'
   s.add_development_dependency 'hometown', '~> 0.2.5'
   s.add_development_dependency 'yard'
+  s.add_development_dependency 'rubycritic'
+
 
   if RUBY_VERSION >= '1.9.3'
     s.add_development_dependency 'guard', '= 2.12.5'
     s.add_development_dependency 'guard-minitest', '= 2.4.4'
     s.add_development_dependency 'rb-fsevent', '= 0.9.4'
+    s.add_development_dependency 'guard-rubycritic'
   end
 
   # compatible with Ruby 1.8.7

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tingyun_rpm
 version: !ruby/object:Gem::Version
-  version: 1.1.4.2
+  version: 1.2.0
 platform: ruby
 authors:
 - tingyun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -164,6 +164,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubycritic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +220,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.9.4
+- !ruby/object:Gem::Dependency
+  name: guard-rubycritic
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +268,6 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".DS_Store"
 - ".gitignore"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
@@ -252,7 +279,6 @@ files:
 - lib/ting_yun/agent.rb
 - lib/ting_yun/agent/agent.rb
 - lib/ting_yun/agent/class_methods.rb
-- lib/ting_yun/agent/collector/base_sampler.rb
 - lib/ting_yun/agent/collector/error_collector.rb
 - lib/ting_yun/agent/collector/error_collector/error_trace_array.rb
 - lib/ting_yun/agent/collector/error_collector/noticed_error.rb
@@ -262,16 +288,24 @@ files:
 - lib/ting_yun/agent/collector/middle_ware_collector/middle_ware.rb
 - lib/ting_yun/agent/collector/middle_ware_collector/sampler.rb
 - lib/ting_yun/agent/collector/sql_sampler.rb
+- lib/ting_yun/agent/collector/sql_sampler/slow_sql.rb
+- lib/ting_yun/agent/collector/sql_sampler/sql_trace.rb
+- lib/ting_yun/agent/collector/sql_sampler/transaction_sql_data.rb
 - lib/ting_yun/agent/collector/stats_engine.rb
 - lib/ting_yun/agent/collector/stats_engine/metric_stats.rb
 - lib/ting_yun/agent/collector/stats_engine/stats_hash.rb
 - lib/ting_yun/agent/collector/transaction_sampler.rb
+- lib/ting_yun/agent/collector/transaction_sampler/class_method.rb
 - lib/ting_yun/agent/collector/transaction_sampler/slowest_sample_buffer.rb
 - lib/ting_yun/agent/collector/transaction_sampler/transaction_sample_buffer_base.rb
 - lib/ting_yun/agent/cross_app/cross_app_monitor.rb
 - lib/ting_yun/agent/cross_app/cross_app_tracing.rb
 - lib/ting_yun/agent/cross_app/inbound_request_monitor.rb
 - lib/ting_yun/agent/database.rb
+- lib/ting_yun/agent/database/connection_manager.rb
+- lib/ting_yun/agent/database/explain_plan_helpers.rb
+- lib/ting_yun/agent/database/obfuscator.rb
+- lib/ting_yun/agent/database/statement.rb
 - lib/ting_yun/agent/datastore.rb
 - lib/ting_yun/agent/datastore/metric_helper.rb
 - lib/ting_yun/agent/datastore/mongo.rb
@@ -288,7 +322,11 @@ files:
 - lib/ting_yun/agent/method_tracer_helpers.rb
 - lib/ting_yun/agent/threading/agent_thread.rb
 - lib/ting_yun/agent/transaction.rb
+- lib/ting_yun/agent/transaction/apdex.rb
 - lib/ting_yun/agent/transaction/attributes.rb
+- lib/ting_yun/agent/transaction/class_method.rb
+- lib/ting_yun/agent/transaction/exceptions.rb
+- lib/ting_yun/agent/transaction/instance_method.rb
 - lib/ting_yun/agent/transaction/request_attributes.rb
 - lib/ting_yun/agent/transaction/trace.rb
 - lib/ting_yun/agent/transaction/trace_node.rb
@@ -296,6 +334,7 @@ files:
 - lib/ting_yun/agent/transaction/transaction_metrics.rb
 - lib/ting_yun/agent/transaction/transaction_sample_builder.rb
 - lib/ting_yun/agent/transaction/transaction_state.rb
+- lib/ting_yun/agent/transaction/transaction_timings.rb
 - lib/ting_yun/configuration.rb
 - lib/ting_yun/configuration/default_source.rb
 - lib/ting_yun/configuration/dotted_hash.rb
@@ -340,15 +379,18 @@ files:
 - lib/ting_yun/instrumentation/support/event_formatter.rb
 - lib/ting_yun/instrumentation/support/evented_subscriber.rb
 - lib/ting_yun/instrumentation/support/external_error.rb
+- lib/ting_yun/instrumentation/support/javascript_instrumentor.rb
 - lib/ting_yun/instrumentation/support/metric_translator.rb
 - lib/ting_yun/instrumentation/support/mongo_formatter.rb
 - lib/ting_yun/instrumentation/support/parameter_filtering.rb
 - lib/ting_yun/instrumentation/support/queue_time.rb
 - lib/ting_yun/instrumentation/support/split_controller.rb
+- lib/ting_yun/instrumentation/support/thrift_helper.rb
 - lib/ting_yun/instrumentation/support/transaction_namer.rb
 - lib/ting_yun/instrumentation/thrift.rb
 - lib/ting_yun/logger.rb
 - lib/ting_yun/logger/agent_logger.rb
+- lib/ting_yun/logger/create_logger_helper.rb
 - lib/ting_yun/logger/log_once.rb
 - lib/ting_yun/logger/memory_logger.rb
 - lib/ting_yun/logger/null_logger.rb
@@ -357,6 +399,8 @@ files:
 - lib/ting_yun/metrics/metric_data.rb
 - lib/ting_yun/metrics/metric_spec.rb
 - lib/ting_yun/metrics/stats.rb
+- lib/ting_yun/middleware/agent_middleware.rb
+- lib/ting_yun/middleware/browser_monitoring.rb
 - lib/ting_yun/support/coerce.rb
 - lib/ting_yun/support/collector.rb
 - lib/ting_yun/support/exception.rb
@@ -408,7 +452,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: TingYun Ruby Agent