mobile_metrics 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6fa6adfc5e4ae4346d9657ba05ab248c2a308513e70f6d56543892b1d6ebff
-  data.tar.gz: 1dc82bbd8dc653c5b9b5bc00dd2a01a26749b2eb3f3003781e3429628da462b0
+  metadata.gz: 3517102712246e11c22fe0bdf3484fbae5f6fd80d88895da29e7075de7c2a6fb
+  data.tar.gz: 151b0833679f05c680cfbe81c74641794b103056e1627af4ee1c16abad60e66f
 SHA512:
-  metadata.gz: cd93876206d714b35ba0a5d515aa866319f73f1463b26e60a34418404b38dd8762c4b3eb585b7162a3ef406dd7fd1b75d561f683a9a26da275444af3eb658a20
-  data.tar.gz: fe8426f6a47bbef1c0b285e295728634361a920915d848e728d907b397940cedb2a5af5a0b877b87ef35a6e968c303f23a728e646a2a9dad2ec10079f9f05006
+  metadata.gz: e26d2c6e2ffc1f5b24b4e32edc0519bf575660296f4c711df8ae2158e41173da1b576de4fb96ecade1b305310f1fcd008f7f3d0caec1caca1776e8d3d159eb83
+  data.tar.gz: c38dde7199e4637cde07fbb14506a045761312ddf724258e1433714946fa4485c6dcebd22f5c00e2f553bc63646679e0273b5feff80aa566249d014a5f92cac2

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    mobile_metrics (0.0.4)
+    mobile_metrics (0.0.6)
       ox (~> 2.0)
 
 GEM

data/lib/mobile_metrics.rb

@@ -1,5 +1,5 @@
-require "mobile_metrics/version"
-require "mobile_metrics/junit"
+require 'mobile_metrics/version'
+require 'mobile_metrics/junit'
 
 require 'time'
 require 'json'
@@ -8,18 +8,18 @@ require 'fileutils'
 require 'pathname'
 
 # Metric types
-METRIC_TIMER    = 'x.mobile_metric.timer'
-METRIC_COUNTER  = 'x.mobile_metric.counter'
-METRIC_RATIO    = 'x.mobile_metric.ratio'
-METRIC_SIZE     = 'x.mobile_metric.size'
+METRIC_TIMER    = 'x.mobile_metric.timer'.freeze
+METRIC_COUNTER  = 'x.mobile_metric.counter'.freeze
+METRIC_RATIO    = 'x.mobile_metric.ratio'.freeze
+METRIC_SIZE     = 'x.mobile_metric.size'.freeze
 
 # Misc Constants
-UNKNOWN = 'UNKNOWN'
-LOG_PREFIX = 'CI-METRICS:'
-LOGGING_DIR = '/tmp/cimetricslogs' 
-UPLOAD_ENV_VAR = 'MOBILE_METRICS_UPLOAD_LOCATION'
+UNKNOWN = 'UNKNOWN'.freeze
+LOG_PREFIX = 'CI-METRICS:'.freeze
+LOGGING_DIR = '/tmp/cimetricslogs'.freeze
+UPLOAD_ENV_VAR = 'MOBILE_METRICS_UPLOAD_LOCATION'.freeze
 
-module MobileMetrics 
+module MobileMetrics
   class Log
 
     @@in_progress_timers = {}
@@ -27,63 +27,63 @@ module MobileMetrics
     @@env_values = nil
     @@verbose = false
     @@upload_location = nil
-    
+
     #========================================
     # Configuration
     #=========================================
-    
+
     # Named params, with ability to override / leave out stuff we don't care about.
     def self.set_default_values(
       # Required params
       project:,
       # These params either aren't required, or have sensible defaults.
-      level: "info", 
-      platform: "iOS", 
-      buildUrl: ENV['BUILD_URL'], 
-      gitUrl: ENV['GIT_URL'], 
-      gitBranch: ENV['DOTCI_BRANCH'], 
-      gitSha: ENV['DOTCI_SHA'], 
+      level: "info",
+      platform: "iOS",
+      buildUrl: ENV['BUILD_URL'],
+      gitUrl: ENV['GIT_URL'],
+      gitBranch: ENV['DOTCI_BRANCH'],
+      gitSha: ENV['DOTCI_SHA'],
       # no sensible defaults for these, we'll strip them later
-      buildType: UNKNOWN, 
+      buildType: UNKNOWN,
       brand: UNKNOWN,
       # Controls log levels within this class
       verbose: false,
       # Upload location for logs
       upload_location: nil
-      ) 
-      
+      )
+
       #TODO: May be able to support overridding these at some point in the future.
       # It won't be threadsafe, but our builds aren't parallelized at the build script level anyway.
       if @@env_values
         print 'Can only override default values once! Aborting!'
         return
       end
-      
-      if project.nil? 
+
+      if project.nil?
         print 'Project value for logging MUST be non-nil, failing build.'
         exit 14
         return
       end
-      
+
       @@verbose = verbose
-      
+
       # Upload location
       @@upload_location = (upload_location || ENV[UPLOAD_ENV_VAR])
-      if @@upload_location.nil? 
+      if @@upload_location.nil?
         print 'Upload location value for logging MUST not be nil, exiting.'
         exit 15
         return
       end
-      
+
       # Create the logging dir + filename
       FileUtils.mkdir_p(LOGGING_DIR)
       filename = "metrics_#{project}_#{build_number}.log"
       @@log_file = Pathname.new(LOGGING_DIR) + filename
       print @@log_file if @@verbose
-      
+
       # Populate our env values
       @@env_values = {}
-      
+
       # Required
       @@env_values[:project] = project
       # Optional
@@ -93,131 +93,150 @@ module MobileMetrics
       @@env_values[:gitBranch] = gitBranch
       @@env_values[:gitSha] = gitSha
       @@env_values[:buildUrl] = buildUrl
-      
+
       #TODO: Should any of these be required? 
       @@env_values[:buildType] = buildType if buildType != UNKNOWN
       @@env_values[:brand] = brand if brand != UNKNOWN
     end
-    
-  # =begin
-  #   # Sample timer metric
-  #   {
-  #   "time": "<yyyy-MM-ddThh:mm:ss[.sss]Z>",
-  #   "name": "x.mobile_metric.<metric_type>",
-  #   "level": "info",
-  #   "data": {
-  #      "name": "<metric_name>",
-  #      … // additional data per metric type
-  #   }
-  #   "context": {
-  #     "platform": "<ios_or_android>",
-  #     "project": "<project_name>",
-  #     "gitUrl": "<git_url>",
-  #     "gitBranch": "<git_branch>",
-  #     "gitSha": "<git_sha>",
-  #     "buildType": "<build_type>",
-  #     "brand": "<brand>",
-  #     "host": "<machine_dns_name_or_device_name>",
-  #     "processId": "<process_id_or_build_number>"
-  #   }
-  # }
-  # =end
+
+    # =begin
+    #   # Sample timer metric
+    #   {
+    #   "time": "<yyyy-MM-ddThh:mm:ss[.sss]Z>",
+    #   "name": "x.mobile_metric.<metric_type>",
+    #   "level": "info",
+    #   "data": {
+    #      "name": "<metric_name>",
+    #      … // additional data per metric type
+    #   }
+    #   "context": {
+    #     "platform": "<ios_or_android>",
+    #     "project": "<project_name>",
+    #     "gitUrl": "<git_url>",
+    #     "gitBranch": "<git_branch>",
+    #     "gitSha": "<git_sha>",
+    #     "buildType": "<build_type>",
+    #     "brand": "<brand>",
+    #     "host": "<machine_dns_name_or_device_name>",
+    #     "processId": "<process_id_or_build_number>"
+    #   }
+    # }
+    # =end
 
     #=========================================
     # Public Logging Methods
     #=========================================
-    
+
     def self.log_ratio_metric(name:, ratio:)
-      overrides = {name: METRIC_RATIO, data: {name: name, ratio: ratio.to_f }}
+      overrides = { name: METRIC_RATIO, data: { name: name, ratio: ratio.to_f } }
       log_partial_metric(overrides)
     end
-    
+
     def self.log_counter_metric(name:, count:)
-      overrides = {name: METRIC_COUNTER, data: {name: name, count: count.to_i }}
+      overrides = { name: METRIC_COUNTER, data: {name: name, count: count.to_i } }
       log_partial_metric(overrides)
     end
-    
+
     def self.log_size_metric(name:, sizeInBytes:, filename:, artifactUrl:)
-      overrides = {name: METRIC_SIZE, data: {name: name, filename: filename, size: sizeInBytes, artifactUrl: artifactUrl }}
+      overrides = { name: METRIC_SIZE, data: { name: name, filename: filename, size: sizeInBytes, artifactUrl: artifactUrl } }
       log_partial_metric(overrides)
     end
-    
+
     def self.start_timer_metric(name:)
-      if @@in_progress_timers.has_key?(name) 
+      if @@in_progress_timers.has_key?(name)
         print "WARNING: #{name} already has a running timer, refusing to start a new timer"
         return
       end
       @@in_progress_timers[name] = monotonic_timestamp
     end
-    
+
     def self.end_timer_metric(name:)
       if !@@in_progress_timers.has_key?(name)
         print "WARNING: #{name} does not have a running timer, the end_timer_metric call has no effect"
         return
       end
-      
+
       # Calculate delta
       start = @@in_progress_timers[name]
       now = monotonic_timestamp
       delta_in_ms = ((now - start) * 1000).to_i
-      
+
       # remove existing timer
       @@in_progress_timers.delete(name)
-      
+
       # log to file
       overrides = {name: METRIC_TIMER, data: {name: name, duration: delta_in_ms }}
       log_partial_metric(overrides)
     end
-    
+
     # Block based timer. This is the recommended way to timer operations.
-    def self.time(name:, &block)
+    def self.time(name:, &_block)
       self.start_timer_metric(name: name)
       yield
       self.end_timer_metric(name: name)
     end
-    
-    def self.upload_logs()
-      # Already called upload logs before, second time is a no-op 
-      if @@log_file.nil? || !@@log_file.file? 
-        print "WARN: Log file is empty or doesn't exist. Was upload_logs called previously?"
-        return 
+
+    def self.log_unit_test_count_from_file(junit_file:, fail_build_on_file_not_found: false)
+      if !File.exist?(junit_file)
+        print "WARN: JUnit file #{junit_file} does not exist on disk"
+        exit 16 if fail_build_on_file_not_found
+        return if !fail_build_on_file_not_found
+      end
+
+      parser = MobileMetrics::JunitParser.new
+      parser.parse(junit_file)
+      unit_test_count = parser.tests.count
+
+      # Only log values > 0 to avoid any parser issues.
+      if unit_test_count == 0
+        print 'WARN: Parsed unit test count is zero, avoiding logging.'
+      else
+        self.log_counter_metric(name: 'unit_tests_count', count: unit_test_count)
       end
-      
+    end
+
+    def self.upload_logs
+      # Already called upload logs before, second time is a no-op
+      if @@log_file.nil? || !@@log_file.file?
+        print 'WARN: Log file is empty or doesn\'t exist. Was upload_logs called previously?'
+        return
+      end
+
       # Skip uploads for local dev machines
-      if !should_upload_logs() 
+      if !should_upload_logs
         print 'Detected local machine, refusing to upload build metrics. Removing intermediate log file'
-        remove_log_file()
+        remove_log_file
         return
       end
-      
+
       # Warn for any open timers
-      if @@in_progress_timers.size > 0 
-        @@in_progress_timers.each { |k,v| 
+      if @@in_progress_timers.size > 0
+        @@in_progress_timers.each { |k, _v|
           print "WARN: Timer not closed when upload_logs was called: #{k}"
         }
       end
-      
-      # Upload 
-      upload_log_file()
-      
+
+      # Upload
+      upload_log_file
+
       # Remove log file
-      remove_log_file()
+      remove_log_file
     end
-    
-    def self.log_file()
+
+    def self.log_file
       @@log_file
     end
-    
-    def self.upload_location()
+
+    def self.upload_location
       @@upload_location
     end
-    
+
     # Tears down logging instance, removes any intermediate log files.
     # Does not finalize or upload any in-progress logs.
     # To use the logger again, you'll have to call set_default_values before any other methods.
-    def self.reset()
-      if @@log_file 
-        remove_log_file()
+    def self.reset
+      if @@log_file
+        remove_log_file
       end
       @@log_file = nil
       @@env_values = nil
@@ -225,15 +244,15 @@ module MobileMetrics
       @@verbose = false
       @@upload_location = nil
     end
-    
-    def self.remove_all_log_files()
-      FileUtils.rm_rf(LOGGING_DIR) 
+
+    def self.remove_all_log_files
+      FileUtils.rm_rf(LOGGING_DIR)
     end
-    
+
   private
 
     # Creates a stubbed metric with common fields
-    def self.default_metric() 
+    def self.default_metric
       if !@@env_values
         print 'default_metric called before env_values initialized, aborting!'
         exit 12
@@ -251,25 +270,25 @@ module MobileMetrics
         buildUrl: @@env_values[:buildUrl],
         host: hostname(),
         processId: build_number()
-      }.select { |k,v| !v.nil? } 
+      }.select { |k,v| !v.nil? }
       {time: timestamp(), level:@@env_values[:level], context: context}
     end
-    
+
     def self.append_to_log(value)
       # Create the log file if it doesn't exist
       if !@@log_file.file? 
-        FileUtils.touch(@@log_file) 
+        FileUtils.touch(@@log_file)
       end
       File.open(@@log_file, 'a+') { |f| f.puts(value + "\n") }
     end
-    
-    def self.remove_log_file()
+
+    def self.remove_log_file
       FileUtils.rm_rf(@@log_file)
     end
-    
-    def self.upload_log_file()
+
+    def self.upload_log_file
       destination = @@upload_location + "metrics_#{@@env_values[:project]}_#{build_number}.log"
-      verbose_flag = @@verbose ? "-v" : ""
+      verbose_flag = @@verbose ? '-v' : ''
       command = "scp #{verbose_flag} -o StrictHostKeyChecking=no #{@@log_file} #{destination}"
       # This feels icky
       print `#{command}`
@@ -279,17 +298,17 @@ module MobileMetrics
     # Note: This format doesn't currently add milliseconds.
     # Example: "2018-03-27T21:12:21Z"
     # Note: DO NOT use this for benchmarking / measuring timers, see monotonic_timestamp instead.
-    def self.timestamp() 
+    def self.timestamp
       Time.now.utc.iso8601.to_s
     end
-    
+
     # Returns a floating point monotonic timestamp suitable for timers
     # Monotonic means we won't ever go back for things like leap seconds
     # Unit is a floating point in seconds.
-    def self.monotonic_timestamp()
+    def self.monotonic_timestamp
       Process.clock_gettime(Process::CLOCK_MONOTONIC)
     end
-    
+
     # Each metric should call this method.
     # This method handles merging the metric hash with the default hash,
     # Generates the JSON with the keys in the right order, then appends to the log.
@@ -300,40 +319,40 @@ module MobileMetrics
       metric = ordered_hash.to_json
       append_to_log(metric)
     end
-    
+
     # Util method for merging the default hash values and overrides recursively as we want them
     def self.merge_hashes(default, overrides)
-      default.merge(overrides) { |key, oldval, newval| 
-        if key == :data || key == :contenxt 
+      default.merge(overrides) { |key, oldval, newval|
+        if key == :data || key == :context 
           oldval.merge(newval)
         else
           newval
         end
       }
     end
-    
+
     # Returns the host name of the machine we are currently running on 
-    def self.hostname() 
+    def self.hostname
       ENV['NODE_NAME'] || 'local-dev'
     end
-    
-    def self.build_number() 
+
+    def self.build_number
       ENV['BUILD_NUMBER']
     end
-    
+
     # This method checks against a bunch of default environment variables available through DOTCI
     # The intent is never to upload timing logs from a local machine, so we make it unlikely that these 
     # env variables are present on a dev's local machine
-    def self.should_upload_logs()
+    def self.should_upload_logs
       have_workspace = ENV['WORKSPACE'] && !ENV['WORKSPACE'].empty?
       have_build_number = ENV['BUILD_NUMBER'] && !ENV['BUILD_NUMBER'].empty?
       have_jenkins_url = ENV['JENKINS_URL'] && !ENV['JENKINS_URL'].empty?
       have_ci_var = ENV['CI'] && !ENV['CI'].empty?
       have_workspace && have_build_number && have_jenkins_url && have_ci_var
     end
-    
+
     def self.print(val)
       puts("#{LOG_PREFIX} #{val}")
     end
   end
-end
+end

data/lib/mobile_metrics/junit.rb

@@ -1,6 +1,5 @@
 
 module MobileMetrics
-  
   # Adapted from: https://github.com/orta/danger-junit/blob/master/lib/junit/plugin.rb
   class JunitParser
     # All the tests for introspection
@@ -55,23 +54,23 @@ module MobileMetrics
       failed_suites = suite_root.nodes.select { |suite| suite[:failures].to_i > 0 || suite[:errors].to_i > 0 }
       failed_tests = failed_suites.map(&:nodes).flatten.select { |node| node.kind_of?(Ox::Element) && node.value == 'testcase' }
 
-      @failures = failed_tests.select do |test| 
+      @failures = failed_tests.select do |test|
         test.nodes.count > 0
       end.select do |test|
         node = test.nodes.first
         node.kind_of?(Ox::Element) && node.value == 'failure'
       end
 
-      @errors = failed_tests.select do |test| 
+      @errors = failed_tests.select do |test|
         test.nodes.count > 0
-      end.select do |test| 
+      end.select do |test|
         node = test.nodes.first
         node.kind_of?(Ox::Element) && node.value == 'error'
       end
 
-      @skipped = tests.select do |test| 
+      @skipped = tests.select do |test|
         test.nodes.count > 0
-      end.select do |test| 
+      end.select do |test|
         node = test.nodes.first
         node.kind_of?(Ox::Element) && node.value == 'skipped'
       end
@@ -79,4 +78,4 @@ module MobileMetrics
       @passes = tests - @failures - @errors - @skipped
     end
   end
-end
+end

data/lib/mobile_metrics/version.rb

@@ -1,3 +1,3 @@
 module MobileMetrics
-  VERSION = "0.0.5"
+  VERSION = '0.0.6'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mobile_metrics
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - dbeard
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-22 00:00:00.000000000 Z
+date: 2019-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ox
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.9
 signing_key: 
 specification_version: 4
 summary: Mobile logging format library