jirametrics 2.30.1pre1 → 2.30.1pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b70c2648c844b678a4b20ae4f9ed570e2a471ff306b4b682d1d0566ba9c334
-  data.tar.gz: ce6972d092d1f5b1bd7425f9d19a8dbbb1d2a7f584e0fe48b9f140faaca96e57
+  metadata.gz: 06c3a3f5e8296c0acf9dfeb03bf42e7773ae59676c45af1fa9c5c9e40ee00fa1
+  data.tar.gz: 30fc6cfdd1857336ad9ac6a73166803c319197ca2b29ddbb055453742d02532b
 SHA512:
-  metadata.gz: 98e35757d64618ff0ee87854a88b98196ccf87cb47761c4a065ead4aae84cb6653cbb37c6746f06a61418fee4c75f31089172028b485b276939f3c07d99b045d
-  data.tar.gz: 1c509febc055eec7ca7d8d9a89a9136e6b6ded8ff8b0585c9b1432b0e2aeb8a8d7301808070eb52b8919e6340928b9aecf137e98a2acd79e6c271fd36a1bc83a
+  metadata.gz: 17b036d6a1f1b8ef6282e001e8befe9c64744cc3b8f529175068762ca1771a1ede57ab3b3dc86744c086e29480d00a1c75636e6784df656f23f1be826b03fc54
+  data.tar.gz: 8f5d9af1c3ab342d93a1d43a0d6c8df3342889412e3e7a7398febf9d1775b831885e85f3b7b4d5841a5e7bbb4f3f2717c245672246cefc1506771b1e016fc0d4

data/lib/jirametrics/download_config.rb

@@ -30,7 +30,7 @@ class DownloadConfig
   end
 
   def github_repo *repos
-    github_repos.concat(repos.map { |r| normalize_github_repo(r) })
+    github_repos.concat(repos)
   end
 
   def start_date today:
@@ -42,8 +42,4 @@ class DownloadConfig
 
   private
 
-  def normalize_github_repo repo
-    match = repo.match(%r{github\.com/([^/]+/[^/]+?)/?$})
-    match ? match[1] : repo
-  end
 end

data/lib/jirametrics/downloader_for_cloud.rb

@@ -101,6 +101,7 @@ class DownloaderForCloud < Downloader
     )
 
     attach_changelog_to_issues issue_datas: issue_datas, issue_jsons: response['issues']
+    attach_worklogs_to_issues issue_datas: issue_datas, issue_jsons: response['issues']
 
     response['issues'].each do |issue_json|
       issue_json['exporter'] = {
@@ -129,6 +130,44 @@ class DownloaderForCloud < Downloader
     issue_datas
   end
 
+  def attach_worklogs_to_issues issue_datas:, issue_jsons:
+    max_results = 100
+
+    issue_jsons.each do |issue_json|
+      worklog = issue_json['fields']['worklog']
+      next unless worklog
+
+      total = worklog['total'].to_i
+      all_worklogs = worklog['worklogs'] || []
+      next if all_worklogs.size >= total
+
+      key = issue_json['key']
+      start_at = all_worklogs.size
+
+      loop do
+        response = @jira_gateway.call_url(
+          relative_url: "/rest/api/3/issue/#{CGI.escape(key)}/worklog?startAt=#{start_at}&maxResults=#{max_results}"
+        )
+
+        worklogs = response['worklogs'] || []
+        all_worklogs.concat(worklogs)
+
+        break if all_worklogs.size >= response['total'].to_i
+
+        start_at += worklogs.size
+      end
+
+      issue_json['fields']['worklog'] = {
+        'startAt' => 0,
+        'maxResults' => all_worklogs.size,
+        'total' => all_worklogs.size,
+        'worklogs' => all_worklogs
+      }
+
+      log "      Enhanced #{key} with #{all_worklogs.size} worklogs"
+    end
+  end
+
   def attach_changelog_to_issues issue_datas:, issue_jsons:
     max_results = 10_000 # The max jira accepts is 10K
     payload = {
@@ -190,7 +229,7 @@ class DownloaderForCloud < Downloader
       unless stale.empty?
         log_start '  Downloading more issues ' unless in_related_phase
         stale.each_slice(100) do |slice|
-          slice = bulk_fetch_issues(issue_datas: slice, board: board, in_initial_query: true)
+          slice = bulk_fetch_issues(issue_datas: slice, board: board, in_initial_query: !in_related_phase)
           progress_dot
           slice.each do |data|
             next unless data.issue

data/lib/jirametrics/downloader_for_data_center.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'worklog_helper'
+
 class DownloaderForDataCenter < Downloader
+  include WorklogHelper
+
   def jira_instance_type
     'Jira DataCenter'
   end
@@ -49,8 +53,12 @@ class DownloaderForDataCenter < Downloader
         }
         identify_other_issues_to_be_downloaded raw_issue: issue_json, board: board
         file = "#{issue_json['key']}-#{board.id}.json"
+        issue_path = File.join(path, file)
+
+        @file_system.save_json(json: issue_json, filename: issue_path)
 
-        @file_system.save_json(json: issue_json, filename: File.join(path, file))
+        # Fetch complete worklog data for this issue
+        enhance_issue_with_worklogs(issue_key: issue_json['key'], issue_path: issue_path)
       end
 
       total = json['total'].to_i

data/lib/jirametrics/github_gateway.rb

@@ -99,17 +99,36 @@ class GithubGateway
     Regexp.new("\\b(?:#{keys_pattern})-\\d+(?![A-Za-z0-9])")
   end
 
-  def run_command args
-    stdout, stderr, status = Open3.capture3('gh', *args)
+  TRANSIENT_HTTP_ERRORS = [429, 500, 502, 503, 504].freeze
+  MAX_RETRIES = 3
 
-    # This extra check seems to only matter on Windows. On the mac, auth failures don't pass status.success?
-    if stderr.include?('SAML enforcement')
-      raise "GitHub CLI is not authorized to access #{@repo}. " \
-            'Run: gh auth refresh -h github.com -s read:org'
-    end
+  def run_command args
+    attempts = 0
+    loop do
+      attempts += 1
+      stdout, stderr, status = Open3.capture3('gh', *args)
+
+      # This extra check seems to only matter on Windows. On the mac, auth failures don't pass status.success?
+      if stderr.include?('SAML enforcement')
+        raise "GitHub CLI is not authorized to access #{@repo}. " \
+              'Run: gh auth refresh -h github.com -s read:org'
+      end
 
-    raise "GitHub CLI command failed for #{@repo}: #{stderr}" unless status.success?
+      unless status.success?
+        if attempts < MAX_RETRIES && TRANSIENT_HTTP_ERRORS.any? { |code| stderr.include?("HTTP #{code}") }
+          delay = 2**attempts
+          @file_system.log "  GitHub returned transient error for #{@repo}: #{stderr.strip}. Retrying in #{delay}s (attempt #{attempts}/#{MAX_RETRIES})...", also_write_to_stderr: true
+          sleep delay
+          next
+        end
+        raise "GitHub CLI command failed for #{@repo}: #{stderr}"
+      end
 
-    JSON.parse(stdout)
+      result = JSON.parse(stdout)
+      if result.nil? || (result.is_a?(Array) && result.empty?)
+        @file_system.warning "No data was found in GitHub for #{@repo}. Is that what you expected?"
+      end
+      return result
+    end
   end
 end

data/lib/jirametrics/jira_gateway.rb

@@ -40,7 +40,7 @@ class JiraGateway
         return parse_response(command: command, result: stdout)
       end
 
-      if RETRYABLE_EXIT_CODES.include?(status.exitstatus) && retries < MAX_RETRIES
+      if RETRYABLE_EXIT_CODES.include?(status.exitstatus) && retries < MAX_RETRIES && !stderr.include?('503')
         retries += 1
         @file_system.log "Transient network error (exit #{status.exitstatus}), retrying in #{RETRY_DELAY_SECONDS}s (attempt #{retries}/#{MAX_RETRIES})..."
         sleep_between_retries
@@ -53,6 +53,11 @@ class JiraGateway
       if stderr.include?('401')
         raise 'The request was not authorized. Verify that your authentication token hasn\'t expired'
       end
+      if stderr.include?('503')
+        raise 'Jira returned 503 (Service Unavailable). This may be a temporary outage, or your ' \
+              'Jira account may have been deactivated due to inactivity. Check your Jira subscription ' \
+              'and try again later.'
+      end
       raise "Failed call with exit status #{status.exitstatus}. " \
         "See #{@file_system.logfile_name} for details"
     end

data/lib/jirametrics/worklog_helper.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module WorklogHelper
+  def enhance_issue_with_worklogs issue_key:, issue_path:
+    all_worklogs = []
+    start_at = 0
+    max_results = 100
+
+    loop do
+      url = "/rest/api/2/issue/#{CGI.escape(issue_key)}/worklog?startAt=#{start_at}&maxResults=#{max_results}"
+      response = @jira_gateway.call_url(relative_url: url)
+
+      worklogs = response['worklogs'] || []
+      all_worklogs.concat(worklogs)
+
+      total = response['total'].to_i
+      break if start_at + worklogs.size >= total
+
+      start_at += max_results
+    end
+
+    # Reload the saved issue and update worklogs
+    issue_json = @file_system.load_json(issue_path)
+    issue_json['worklog'] = {
+      'startAt' => 0,
+      'maxResults' => all_worklogs.size,
+      'total' => all_worklogs.size,
+      'worklogs' => all_worklogs
+    }
+    @file_system.save_json(json: issue_json, filename: issue_path)
+
+    log "      Enhanced #{issue_key} with #{all_worklogs.size} worklogs" if all_worklogs.any?
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: 2.30.1pre1
+  version: 2.30.1pre2
 platform: ruby
 authors:
 - Mike Bowler
@@ -188,6 +188,7 @@ files:
 - lib/jirametrics/user.rb
 - lib/jirametrics/value_equality.rb
 - lib/jirametrics/wip_by_column_chart.rb
+- lib/jirametrics/worklog_helper.rb
 homepage: https://jirametrics.org
 licenses:
 - Apache-2.0
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.13
 specification_version: 4
 summary: Extract Jira metrics
 test_files: []