facter 4.0.36 → 4.0.37

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ceb625b0a349be8f5f574055b24aebd9860672ccdfc27224377a75255681b571
-  data.tar.gz: 1081225dee1a50781041d65599bc74fccf1552fe1ce75a9195f0aecd8608afb8
+  metadata.gz: f2ed5162fef26cfbf5bd010cf7737ac8b4856cf59f9f55745d6cfc1bec39781e
+  data.tar.gz: 761beee20f449b3bbe1e5dc35c0bcd675e9602902804e7add3ee6c3d31a8916d
 SHA512:
-  metadata.gz: 0c31f37ed2064c1683e9f56a5d252bab225e1af0c0df025d1621ef89551fefa6a0816cc3862d4c98ab2480a6e158f62b18bcf0d5ae9f2d75f22799297660ffc9
-  data.tar.gz: d6f071e0bf9bcdf01c460ea7ac45d0cb50459c4a40e663761cf7c58de0068b6c9e444cebedd5304a692317a960a8d1327accea35f6815b90076e4acc4ce2ec3b
+  metadata.gz: 92751ef6452023c4e4edd9c2b7d21bd78bef74404d5550d4de353b4243f6639f29abbba1f00d6f8ba0b4bbf7afbea060f00aa34919a2d1d94459e1df5515e706
+  data.tar.gz: b4ca79c0907439874ae638a920def98b9ed0d3e2893a77b6bc3d44dfb3cba756f88e550d55d14a8e4cdb9d2c5b58a6d0c6a6c335955ae819607021a80562cd65

data/lib/facter/custom_facts/util/directory_loader.rb

@@ -84,7 +84,7 @@ module LegacyFacter
           parser = LegacyFacter::Util::Parser.parser_for(fact.file)
           next if parser.nil?
 
-          data = parser.results
+          data = resolve_fact(fact, parser)
 
           if data == false
             LegacyFacter.warn "Could not interpret fact file #{fact.file}"
@@ -99,6 +99,14 @@ module LegacyFacter
         end
       end
 
+      def resolve_fact(fact, parser)
+        data = nil
+        fact_name = File.basename(fact.file)
+        Facter::Framework::Benchmarking::Timer.measure(fact_name) { data = parser.results }
+
+        data
+      end
+
       def entries
         dirs = @directories.select { |directory| File.directory?(directory) }.map do |directory|
           Dir.entries(directory).map { |directory_entry| File.join(directory, directory_entry) }

data/lib/facter/custom_facts/util/fact.rb

@@ -118,7 +118,10 @@ module Facter
 
         searching do
           suitable_resolutions = sort_by_weight(find_suitable_resolutions(@resolves))
-          @value = find_first_real_value(suitable_resolutions)
+
+          Facter::Framework::Benchmarking::Timer.measure(@name) do
+            @value = find_first_real_value(suitable_resolutions)
+          end
 
           announce_when_no_suitable_resolution(suitable_resolutions)
           announce_when_no_value_found(@value)

data/lib/facter/facts/linux/partitions.rb

@@ -14,7 +14,7 @@ module Facts
         mountpoints = Facter::Resolvers::Mountpoints.resolve(:mountpoints)
         return parts unless mountpoints
 
-        mountpoints.each do |mnt|
+        mountpoints.reverse_each do |mnt|
           next unless parts[mnt[:device]]
 
           parts[mnt[:device]].merge!(mount: mnt[:path])

data/lib/facter/facts/ubuntu/lsbdistrelease.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Facts
+  module Ubuntu
+    class Lsbdistrelease
+      FACT_NAME = 'lsbdistrelease'
+      ALIASES = %w[lsbmajdistrelease lsbminordistrelease].freeze
+      TYPE = :legacy
+
+      def call_the_resolver
+        fact_value = Facter::Resolvers::LsbRelease.resolve(:release)
+
+        return Facter::ResolvedFact.new(FACT_NAME, nil, :legacy) unless fact_value
+
+        version = fact_value.split('.')
+
+        [Facter::ResolvedFact.new(FACT_NAME, fact_value, :legacy),
+         Facter::ResolvedFact.new(ALIASES[0], version[0], :legacy),
+         Facter::ResolvedFact.new(ALIASES[1], version[1], :legacy)]
+      end
+    end
+  end
+end

data/lib/facter/framework/benchmarking/timer.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+require 'benchmark'
+
+module Facter
+  module Framework
+    module Benchmarking
+      class Timer
+        class << self
+          def measure(fact_name)
+            if Options[:timing]
+              time = Benchmark.measure { yield }
+
+              puts "fact `#{fact_name}`, took: #{time.format('%r')} seconds"
+            else
+              yield
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/facter/framework/cli/cli.rb

@@ -108,6 +108,11 @@ module Facter
                  aliases: '-p',
                  desc: 'Load the Puppet libraries, thus allowing Facter to load Puppet-specific facts.'
 
+    class_option :timing,
+                 type: :boolean,
+                 aliases: '-t',
+                 desc: 'Show how much time it took to resolve each fact'
+
     desc '--man', 'Manual', hide: true
     map ['--man'] => :man
     def man(*args)

data/lib/facter/framework/core/fact/internal/internal_fact_manager.rb

@@ -36,7 +36,8 @@ module Facter
         .each do |searched_fact|
         begin
           fact = CoreFact.new(searched_fact)
-          fact_value = fact.create
+          fact_value = nil
+          Facter::Framework::Benchmarking::Timer.measure(searched_fact.name) { fact_value = fact.create }
           resolved_facts << fact_value unless fact_value.nil?
         rescue StandardError => e
           @@log.log_exception(e)

data/lib/facter/framework/core/fact_loaders/internal_fact_loader.rb

@@ -30,18 +30,18 @@ module Facter
     def load_for_os(operating_system)
       # select only classes
       classes = ClassDiscoverer.instance.discover_classes(operating_system)
-
       classes.each do |class_name|
         fact_name = class_name::FACT_NAME
-
         # if fact is already loaded, skip it
-        next if @facts.any? { |fact| fact.name == fact_name }
-
-        type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
-        load_fact(fact_name, class_name, type)
+        unless @facts.any? { |fact| fact.name == fact_name }
+          type = class_name.const_defined?('TYPE') ? class_name::TYPE : :core
+          load_fact(fact_name, class_name, type)
+        end
         next unless class_name.const_defined?('ALIASES')
 
-        [*class_name::ALIASES].each { |fact_alias| load_fact(fact_alias, class_name, :legacy) }
+        [*class_name::ALIASES].each do |fact_alias|
+          load_fact(fact_alias, class_name, :legacy) unless @facts.any? { |fact| fact.name == fact_alias }
+        end
       end
     end
 

data/lib/facter/framework/core/file_loader.rb

@@ -39,6 +39,8 @@ load_dir(['resolvers'])
 load_dir(['facts_utils'])
 load_dir(%w[framework core])
 load_dir(['models'])
+load_dir(%w[framework benchmarking])
+
 load_dir(%w[framework core fact_loaders])
 load_dir(%w[framework core fact internal])
 load_dir(%w[framework core fact external])

data/lib/facter/framework/core/options/option_store.rb

@@ -23,6 +23,7 @@ module Facter
     @block_list = {}
     @fact_groups = {}
     @color = false
+    @timing = false
 
     class << self
       attr_reader :debug, :verbose, :log_level, :show_legacy, :ruby,
@@ -31,7 +32,7 @@ module Facter
       attr_accessor :config, :user_query, :strict, :json, :haml, :external_facts,
                     :cache, :yaml, :puppet, :ttls, :block, :cli, :config_file_custom_dir,
                     :config_file_external_dir, :default_external_dir, :fact_groups,
-                    :block_list, :color, :trace
+                    :block_list, :color, :trace, :timing
 
       attr_writer :external_dir
 
@@ -159,6 +160,7 @@ module Facter
         @blocked_facts = []
         @fact_groups = {}
         @block_list = {}
+        @timing = false
       end
 
       def fallback_external_dir

data/lib/facter/framework/core/session_cache.rb

@@ -2,13 +2,10 @@
 
 module Facter
   class SessionCache
-    @semaphore = Mutex.new
     @resolvers = []
 
     def self.subscribe(resolver)
-      @semaphore.synchronize do
-        @resolvers << resolver
-      end
+      @resolvers << resolver
     end
 
     def self.invalidate_all_caches

data/lib/facter/resolvers/aio_agent_version.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class AioAgentVersion < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/aix/architecture_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Architecture < BaseResolver
       # :architecture
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/aix/disks.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Disks < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,12 +13,12 @@ module Facter
           end
 
           def execute_lspv(fact_name)
-            @fact_list[:disks] = {}
-
             result = Facter::Core::Execution.execute('lspv', logger: log)
 
             return if result.empty?
 
+            @fact_list[:disks] = {}
+
             result.each_line do |line|
               disk_name = line.split(' ')[0].strip
               size = find_size(disk_name)

data/lib/facter/resolvers/aix/filesystem_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Filesystem < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/hardware_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     class Hardware < BaseResolver
       # :hardware
-      @semaphore = Mutex.new
       @fact_list ||= {}
       class << self
         private

data/lib/facter/resolvers/aix/load_averages_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class LoadAverages < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/aix/memory.rb

@@ -5,7 +5,6 @@ module Facter
     module Aix
       class Memory < BaseResolver
         # :hardware
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -18,11 +17,11 @@ module Facter
             result = Facter::Core::Execution.execute('svmon', logger: log)
             return if result.empty?
 
-            @fact_list[:system] = @fact_list[:swap] = {}
-
             pagesize = call_pagesize.to_i
             return if pagesize.zero?
 
+            @fact_list[:system] = @fact_list[:swap] = {}
+
             result.each_line do |line|
               @fact_list[:system] = populate_system(line, pagesize) if line.include?('memory')
               @fact_list[:swap] = populate_swap(line, pagesize) if line =~ /pg\sspace/

data/lib/facter/resolvers/aix/mountpoints.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Mountpoints < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         BLOCK_SIZE = 512
 

data/lib/facter/resolvers/aix/networking_resolver.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Networking < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/nim.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Nim < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/aix/os_level_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class OsLevel < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/aix/partitions.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Partitions < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private
@@ -14,8 +13,6 @@ module Facter
           end
 
           def query_cudv(fact_name)
-            @fact_list[:partitions] = {}
-
             odmquery = Facter::ODMQuery.new
             odmquery.equals('PdDvLn', 'logical_volume/lvsubclass/lvtype')
 
@@ -23,6 +20,8 @@ module Facter
 
             return unless result
 
+            @fact_list[:partitions] = {}
+
             result.each_line do |line|
               next unless line.include?('name')
 

data/lib/facter/resolvers/aix/processors.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Processors < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/aix/serialnumber.rb

@@ -4,7 +4,6 @@ module Facter
   module Resolvers
     module Aix
       class Serialnumber < BaseResolver
-        @semaphore = Mutex.new
         @fact_list ||= {}
 
         class << self

data/lib/facter/resolvers/augeas_resolver.rb

@@ -3,7 +3,6 @@
 module Facter
   module Resolvers
     class Augeas < BaseResolver
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/base_resolver.rb

@@ -16,15 +16,20 @@ module Facter
       end
 
       def self.resolve(fact_name)
-        @semaphore.synchronize do
-          subscribe_to_manager
-          post_resolve(fact_name)
-        end
+        subscribe_to_manager
+        post_resolve(fact_name)
+
+        validate_resolution(fact_name)
       rescue LoadError, NameError => e
         log.debug("resolving fact #{fact_name}, but #{e}")
         @fact_list[fact_name] = nil
       end
 
+      def self.validate_resolution(fact_name)
+        @fact_list.fetch(fact_name) { @fact_list[fact_name] = nil }
+        @fact_list[fact_name]
+      end
+
       def self.post_resolve(_fact_name)
         raise NotImplementedError, "You must implement post_resolve(fact_name) method in #{name}"
       end

data/lib/facter/resolvers/bsd/processors.rb

@@ -5,7 +5,6 @@ module Facter
     module Bsd
       class Processors < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         class << self
           private

data/lib/facter/resolvers/containers.rb

@@ -6,7 +6,6 @@ module Facter
       # :virtual
       # :hypervisor
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
       INFO = { 'docker' => 'id', 'lxc' => 'name' }.freeze
 

data/lib/facter/resolvers/debian_version.rb

@@ -7,7 +7,6 @@ module Facter
       # :minor
       # :full
 
-      @semaphore = Mutex.new
       @fact_list ||= {}
 
       class << self

data/lib/facter/resolvers/disk_resolver.rb

@@ -5,7 +5,6 @@ module Facter
     module Linux
       class Disk < BaseResolver
         @log = Facter::Log.new(self)
-        @semaphore = Mutex.new
         @fact_list ||= {}
         DIR = '/sys/block'
         FILE_PATHS = { model: 'device/model', size: 'size', vendor: 'device/vendor' }.freeze