Merge pull request #72 from FRRouting/master

Release 2.3.2

app/github_app.rb

@@ -38,6 +38,12 @@ def sinatra_logger_level
     attr_writer :sinatra_logger_level
   end
 
+  get '/telemetry' do
+    content_type :json
+
+    Telemetry.instance.stats
+  end
+
   get '/ping' do
     halt 200, 'Pong'
   end

config/puma.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 #  SPDX-License-Identifier: BSD-2-Clause
 #
 #  puma.rb
@@ -8,16 +6,28 @@
 #  Copyright (c) 2023 by
 #  Network Device Education Foundation, Inc. ("NetDEF")
 #
+#  frozen_string_literal: true
 
 require_relative '../config/setup'
 require 'puma'
 
 workers 10
 
-threads_count = (ENV['RAILS_MAX_THREADS'] || 5).to_i
-threads 1, threads_count
+threads 1, (ENV['RAILS_MAX_THREADS'] || 5).to_i
+
 port GitHubApp::Configuration.instance.config['port'] || 4667
 
+activate_control_app
+
 preload_app!
 
 pidfile 'puma.pid'
+
+before_fork do
+  Thread.new do
+    loop do
+      Telemetry.instance.update_stats Puma.stats
+      sleep 30
+    end
+  end
+end

lib/github/build/retry.rb

@@ -45,7 +45,7 @@ def enqueued_stages
 
       def enqueued_failure_tests
         @check_suite.ci_jobs.where.not(status: :success).each do |ci_job|
-          next unless ci_job.stage.configuration.can_retry?
+          next if must_skip_retry?(ci_job)
 
           logger(Logger::WARN, "Enqueue CiJob: #{ci_job.inspect}")
           ci_job.enqueue(@github)
@@ -57,6 +57,10 @@ def enqueued_failure_tests
 
       private
 
+      def must_skip_retry?(ci_job)
+        ci_job.stage.nil? || !ci_job.stage.configuration.can_retry?
+      end
+
       def logger(severity, message)
         @loggers.each do |logger_object|
           logger_object.add(severity, message)

lib/github/check.rb

@@ -63,7 +63,7 @@ def create(name)
         @check_suite.pull_request.repository,
         name,
         @check_suite.commit_sha_ref,
-        accept: 'application/vnd.github+json'
+        accept: 'application/vnd.github.antiope-preview+json'
       )
     end
 
@@ -92,14 +92,20 @@ def skipped(check_ref, output = {})
     end
 
     def get_check_run(check_ref)
-      @app.check_run(@check_suite.pull_request.repository, check_ref).to_h
+      @app.check_run(@check_suite.pull_request.repository,
+                     check_ref,
+                     accept: 'application/vnd.github.antiope-preview+json').to_h
     end
 
     def fetch_check_runs
       return [] if @check_suite.nil?
 
       @app
-        .check_runs_for_ref(@check_suite.pull_request.repository, @check_suite.pull_request.branch_name)
+        .check_runs_for_ref(
+          @check_suite.pull_request.repository,
+          @check_suite.pull_request.branch_name,
+          accept: 'application/vnd.github.antiope-preview+json'
+        )
         .to_h[:check_runs]
         .map do |check_run|
         check_run[:id]
@@ -129,7 +135,7 @@ def fetch_username(username)
     def basic_status(check_ref, status, output)
       opts = {
         status: status,
-        accept: 'application/vnd.github+json'
+        accept: 'application/vnd.github.antiope-preview+json'
       }
 
       opts[:output] = output unless output.empty?

lib/github_ci_app.rb

@@ -34,6 +34,7 @@
 require_relative 'helpers/github_logger'
 require_relative 'helpers/request'
 require_relative 'helpers/sinatra_payload'
+require_relative 'helpers/telemetry'
 
 # Slack libs
 require_relative 'slack/slack'

lib/helpers/telemetry.rb

@@ -0,0 +1,26 @@
+#  SPDX-License-Identifier: BSD-2-Clause
+#
+#  telemetry.rb
+#  Part of NetDEF CI System
+#
+#  Copyright (c) 2024 by
+#  Network Device Education Foundation, Inc. ("NetDEF")
+#
+#  frozen_string_literal: true
+
+require 'singleton'
+require 'json'
+
+class Telemetry
+  include Singleton
+
+  # :nocov:
+  def update_stats(stats)
+    File.write('telemetry.json', stats.to_json)
+  end
+
+  def stats
+    JSON.parse(File.read('telemetry.json'))
+  end
+  # :nocov:
+end

reports/re_run_report.rb

@@ -96,6 +96,8 @@ def create_csv(filename)
 
     def raw_output(result, file_descriptor: nil)
       result.each_pair do |pull_request, info|
+        next if info[:total] <= OFFENDER_LIMIT
+
         print("\nPull Request: ##{pull_request} - Reruns: #{info[:total]}", file_descriptor)
 
         info[:check_suites].each do |cs|

spec/lib/github/check_spec.rb

@@ -90,7 +90,7 @@
     before do
       allow(fake_client).to receive(:create_check_run)
         .with(check_suite.pull_request.repository, name,
-              check_suite.commit_sha_ref, accept: 'application/vnd.github+json')
+              check_suite.commit_sha_ref, accept: 'application/vnd.github.antiope-preview+json')
         .and_return(pr_info)
     end
 
@@ -110,7 +110,7 @@
               id,
               {
                 status: status,
-                accept: 'application/vnd.github+json'
+                accept: 'application/vnd.github.antiope-preview+json'
               })
         .and_return(pr_info)
     end
@@ -133,7 +133,7 @@
               {
                 status: status,
                 output: output,
-                accept: 'application/vnd.github+json'
+                accept: 'application/vnd.github.antiope-preview+json'
               })
         .and_return(pr_info)
     end
@@ -199,7 +199,7 @@
               {
                 status: status,
                 conclusion: conclusion,
-                accept: 'application/vnd.github+json'
+                accept: 'application/vnd.github.antiope-preview+json'
               })
         .and_return(true)
     end