oneapm_rpm 1.2.5 → 1.2.6.rc1

data/lib/one_apm/configuration/yaml_source.rb

@@ -18,9 +18,14 @@ module OneApm
           return unless @file_path
 
           OneApm::Manager.logger.info("Reading configuration from #{path} (#{Dir.pwd})")
-          raw_file = File.read(@file_path)
+          raw_file = if RUBY_VERSION >= '1.9.3'
+            File.read(@file_path, :encoding => 'utf-8') 
+          else
+            File.read(@file_path)
+          end
           erb_file = process_erb(raw_file)
           config   = process_yaml(erb_file, env, config, @file_path)
+          add_notified!(config)
         rescue ScriptError, StandardError => e
           OneApm::Manager.logger.error("Failed to read or parse configuration file at #{path}", e)
         end
@@ -97,6 +102,22 @@ module OneApm
         config
       end
 
+      #add notified to key of config
+      #before: {'a' => 1, 'b' => {'c' => 2}}  
+      #after:  {'a' => 1, 'a.notified' => true, 'b' => {'c' => 1, 'c.notified' => true}}
+      def add_notified! config
+        config.keys.each do |key|
+          if config[key].respond_to?(:has_key?)
+            config[key].keys.each do |inner_key|
+              config[key]["#{inner_key}.notified"] = true unless config[key].has_key?("#{inner_key}.notified")
+            end
+            next
+          end
+          config["#{key}.notified"] = true unless config.has_key?("#{key}.notified")
+        end
+        config
+      end
+
       def substitute_transaction_threshold(config)
         if config['transaction_tracer'] &&
             config['transaction_tracer']['transaction_threshold'] =~ /apdex_f/i

data/lib/one_apm/configuration.rb

@@ -256,6 +256,16 @@ module OneApm
         end
       end
 
+      def to_notified_hash
+        @notified_hash = {}
+        to_collector_hash.each{|k, v| @notified_hash[k]= v.to_s}
+        return @notified_hash unless OneApm::Manager.config[:'notified.enable']
+        @notified_hash.select do |k, v|
+          default = DEFAULTS[k]
+          OneApm::Manager.config[:"#{k}.notified"] || (default && default.fetch(:notified, false))
+        end
+      end
+
       def app_names
         case OneApm::Manager.config[:app_name]
         when Array then OneApm::Manager.config[:app_name]
@@ -359,8 +369,12 @@ module OneApm
         grouped_by_type.values.map(&:last)
       end
 
+      #parse hash of labels 
+      #delete key eql 'labels.xxx.notified'
       def parse_labels_from_dictionary
-        make_label_hash(OneApm::Manager.config[:labels])
+        labels = OneApm::Manager.config[:labels]
+        labels.delete_if{|k, v| k.include?(".notified")}
+        make_label_hash(labels)
       end
 
       # Generally only useful during initial construction and tests

data/lib/one_apm/support/local_environment.rb

@@ -38,7 +38,6 @@ module OneApm
         mod = OneApm::LocalEnvironment.const_get const
         self.extend mod if mod.instance_of? Module
       end
-
       discover_dispatcher
     end
 
@@ -133,13 +132,13 @@ module OneApm
     end
 
     def check_for_puma
-      if defined?(::Puma) && File.basename($0) == 'puma'
+      if defined?(::Puma) && executable =~ /puma/
         @discovered_dispatcher = :puma
       end
     end
 
     def check_for_delayed_job
-      if $0 =~ /delayed_job$/ || (File.basename($0) == 'rake' && ARGV.include?('jobs:work'))
+      if $0 =~ /delayed_job$/ || (executable == 'rake' && ARGV.include?('jobs:work'))
         @discovered_dispatcher = :delayed_job
       end
     end
@@ -158,7 +157,7 @@ module OneApm
     end
 
     def check_for_sidekiq
-      if defined?(::Sidekiq) && File.basename($0) == 'sidekiq'
+      if defined?(::Sidekiq) && executable == 'sidekiq'
         @discovered_dispatcher = :sidekiq
       end
     end

data/lib/one_apm/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oneapm_rpm
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6.rc1
 platform: ruby
 authors:
 - oneapm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-23 00:00:00.000000000 Z
+date: 2015-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake