ci-queue 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78b51045e571e242b8d4b64e49f37abd462be948f007de6a63380ca0f448ce4c
-  data.tar.gz: bdec2201394129e091516b82e5709a016209aec6a8f41488132ac8400c88150d
+  metadata.gz: 9f86ba12b294a5698c6b1fa568d5482f549758e54ea85db004507a498a7477f1
+  data.tar.gz: bc54f7c6890c5c1d172a634cafa961a8a5bb76980eed482a7fb0ef8fe1dcaad8
 SHA512:
-  metadata.gz: e51188516bdd8b04c29981a4cd7f89ac2f6a8a7979c72210065362d34b86565522e3e26305a2c088656d543c064c802c4886f6ad4801f675b7c73cbec82da38c
-  data.tar.gz: 14853c01858461192992d2dd330a96dcb66ca6a9c17100c4d73b4d6b364cb7b1c7e8661b14d8136a454f2d0bf0a72a8af375a07dd6eba91a2541784f6964f1fc
+  metadata.gz: bbc243b619402d0b4addf5cb85a9ac4bfa91668a9abd5b6d6c3ab48bc47a317271a2efa8bea88f4e3a9e733f3832ba731ba1afb0c21e8e330fda86f87218586b
+  data.tar.gz: d7b7f715153b663757f4ee60c3f2bd7236e3b7b9308e1577e8e95b26a4af8b7892965cfabc8ca61847c09c39eb73b5ce3463ccede6e209046f7d5e8e21bf474d

data/lib/ci/queue/configuration.rb

@@ -2,7 +2,8 @@
 module CI
   module Queue
     class Configuration
-      attr_accessor :timeout, :build_id, :worker_id, :max_requeues, :requeue_tolerance, :namespace, :seed, :failing_test
+      attr_accessor :timeout, :build_id, :worker_id, :max_requeues
+      attr_accessor :requeue_tolerance, :namespace, :seed, :failing_test, :statsd_endpoint
 
       class << self
         def from_env(env)
@@ -11,6 +12,7 @@ module CI
             worker_id: env['CIRCLE_NODE_INDEX'] || env['BUILDKITE_PARALLEL_JOB'],
             seed: env['CIRCLE_SHA1'] || env['BUILDKITE_COMMIT'] || env['TRAVIS_COMMIT'],
             flaky_tests: load_flaky_tests(env['CI_QUEUE_FLAKY_TESTS']),
+            statsd_endpoint: env['CI_QUEUE_STATSD_ADDR'],
           )
         end
 
@@ -24,7 +26,7 @@ module CI
 
       def initialize(
         timeout: 30, build_id: nil, worker_id: nil, max_requeues: 0, requeue_tolerance: 0,
-        namespace: nil, seed: nil, flaky_tests: []
+        namespace: nil, seed: nil, flaky_tests: [], statsd_endpoint: nil
       )
         @namespace = namespace
         @timeout = timeout
@@ -34,6 +36,7 @@ module CI
         @requeue_tolerance = requeue_tolerance
         @seed = seed
         @flaky_tests = flaky_tests
+        @statsd_endpoint = statsd_endpoint
       end
 
       def flaky?(test)

data/lib/ci/queue/version.rb

@@ -1,6 +1,6 @@
 module CI
   module Queue
-    VERSION = '0.12.0'
+    VERSION = '0.12.1'
     DEV_SCRIPTS_ROOT = ::File.expand_path('../../../../../redis', __FILE__)
     RELEASE_SCRIPTS_ROOT = ::File.expand_path('../redis', __FILE__)
   end

data/lib/minitest/queue/build_status_recorder.rb

@@ -47,8 +47,7 @@ module Minitest
           self.failures += 1
         end
 
-
-        stats = COUNTERS.zip(COUNTERS.map { |c| send(c) })
+        stats = COUNTERS.zip(COUNTERS.map { |c| send(c) }).to_h
         if (test.failure || test.error?) && !test.skipped?
           build.record_error("#{test.klass}##{test.name}", dump(test), stats: stats)
         else

data/lib/minitest/queue/junit_reporter.rb

@@ -24,7 +24,7 @@ module Minitest
 
         xml = Builder::XmlMarkup.new(indent: 2)
         xml.instruct!
-        xml.test_suites do
+        xml.testsuites do
           suites.each do |suite, tests|
             add_tests_to(xml, suite, tests)
           end

data/lib/minitest/queue/runner.rb

@@ -3,6 +3,7 @@ require 'minitest/queue'
 require 'ci/queue'
 require 'digest/md5'
 require 'minitest/reporters/bisect_reporter'
+require 'minitest/reporters/statsd_reporter'
 
 module Minitest
   module Queue
@@ -43,12 +44,16 @@ module Minitest
       def run_command
         set_load_path
         Minitest.queue = queue
-        Minitest.queue_reporters = [
+        reporters = [
           LocalRequeueReporter.new,
           BuildStatusRecorder.new(build: queue.build),
           JUnitReporter.new,
           OrderReporter.new(path: 'log/test_order.log'),
         ]
+        if queue_config.statsd_endpoint
+          reporters << Minitest::Reporters::StatsdReporter.new(statsd_endpoint: queue_config.statsd_endpoint)
+        end
+        Minitest.queue_reporters = reporters
 
         trap('TERM') { Minitest.queue.shutdown! }
         trap('INT') { Minitest.queue.shutdown! }

data/lib/minitest/queue/statsd.rb

@@ -0,0 +1,60 @@
+# Implements a small and limited StatsD implementation to reduce importing unnecessary dependencies because
+# we don't want to require on the bundle which would slow down a CI Queue run
+
+require 'socket'
+
+module Minitest
+  module Queue
+    class Statsd
+      attr_reader :addr, :namespace, :default_tags
+
+      def initialize(addr: nil, default_tags: [], namespace: nil)
+        @default_tags = default_tags
+        @namespace = namespace
+        @addr = addr
+
+        if addr
+          host, port = addr.split(':', 2)
+          @socket = UDPSocket.new
+          @socket.connect(host, Integer(port))
+        end
+      rescue SocketError => e
+        # No-op, we shouldn't fail CI because of statsd
+      end
+
+      def increment(metric, tags: [], value: 1)
+        send_metric(type: 'c', value: value, metric: metric, tags: default_tags + tags)
+      end
+
+      def measure(metric, duration = nil, tags: [], &block)
+        if block_given?
+          return_value, duration = Minitest::Queue::Statsd.measure_duration(&block)
+        elsif duration.nil?
+          raise ArgumentError, "You need to pass a block or pass a float as second argument."
+        end
+        send_metric(type: 'ms', value: duration, metric: metric, tags: default_tags + tags)
+        return_value
+      end
+
+      def self.measure_duration
+        before = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
+        return_value = yield
+        after = Process.clock_gettime(Process::CLOCK_REALTIME, :millisecond)
+
+        [return_value, after - before]
+      end
+
+      private
+
+      def send_metric(type:, metric:, value:, tags:)
+        return unless @socket 
+        metric_snippet = namespace.nil? ? metric : "#{namespace}.#{metric}"
+        tags_snippet = tags.empty? ? '' : "|##{tags.join(',')}"
+        payload = "#{metric_snippet}:#{value}|#{type}#{tags_snippet}"
+        @socket.send(payload, 0)
+      rescue SystemCallError
+        # No-op, we shouldn't fail or spam output due to statsd issues
+      end
+    end
+  end
+end

data/lib/minitest/reporters/statsd_reporter.rb

@@ -0,0 +1,45 @@
+require 'minitest/queue'
+require 'minitest/queue/statsd'
+require 'minitest/reporters'
+
+module Minitest
+  module Reporters
+    class StatsdReporter < Minitest::Reporters::BaseReporter
+      FAILING_INFRASTRUCTURE_THRESHOLD = 10
+
+      attr_reader :statsd
+
+      def initialize(statsd: Minitest::Queue::Statsd, statsd_endpoint: nil, **options)
+        super(options)
+        @statsd = statsd.new(
+          addr: statsd_endpoint,
+          namespace: 'minitests.tests',
+          default_tags: ["slug:#{ENV['BUILDKITE_PROJECT_SLUG']}"]
+        )
+        @failures = 0
+      end
+
+      def record(result)
+        if result.passed?
+          @statsd.increment("passed")
+        elsif result.skipped? && !result.requeued?
+          @statsd.increment("skipped")
+        else
+          @statsd.increment('requeued') if result.requeued?
+
+          if result.failure.is_a?(Minitest::UnexpectedError)
+            @statsd.increment("unexpected_errors")
+          else
+            @statsd.increment("failed")
+          end
+
+          @failures += 1
+        end
+      end
+
+      def report
+        @statsd.increment("failing_infrastructure_threshold") if @failures >= FAILING_INFRASTRUCTURE_THRESHOLD
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ci-queue
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Jean Boussier
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-03-29 00:00:00.000000000 Z
+date: 2018-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -198,7 +198,9 @@ files:
 - lib/minitest/queue/local_requeue_reporter.rb
 - lib/minitest/queue/order_reporter.rb
 - lib/minitest/queue/runner.rb
+- lib/minitest/queue/statsd.rb
 - lib/minitest/reporters/bisect_reporter.rb
+- lib/minitest/reporters/statsd_reporter.rb
 - lib/rspec/queue.rb
 - lib/rspec/queue/build_status_recorder.rb
 - railgun.yml