jirametrics 2.30.1pre1 → 2.30.1pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1b70c2648c844b678a4b20ae4f9ed570e2a471ff306b4b682d1d0566ba9c334
-  data.tar.gz: ce6972d092d1f5b1bd7425f9d19a8dbbb1d2a7f584e0fe48b9f140faaca96e57
+  metadata.gz: 4d72da7d4b92e9ea83de819c57a477926fc5957abd19bde090846e36e7c73f0b
+  data.tar.gz: 7e953c0c3af6184a65ec820e23c0e53026eec6381818617ad8bf738179fc22b8
 SHA512:
-  metadata.gz: 98e35757d64618ff0ee87854a88b98196ccf87cb47761c4a065ead4aae84cb6653cbb37c6746f06a61418fee4c75f31089172028b485b276939f3c07d99b045d
-  data.tar.gz: 1c509febc055eec7ca7d8d9a89a9136e6b6ded8ff8b0585c9b1432b0e2aeb8a8d7301808070eb52b8919e6340928b9aecf137e98a2acd79e6c271fd36a1bc83a
+  metadata.gz: 25c2c1beee567c1ce1c43493c36d178d87eb6991716f0318691ed2933b9f38ffa86d07857bcdffde8cf6b6e1acc70dba95192ea45319c06675f99f65197ee267
+  data.tar.gz: 1873e39f4af4cb0f1db2c28192c8a8bbf635f0a8d57d8df810f368dcdf3b3b2a3b73192d90099c7e918585439310d4f48e0a2e58486a7358fe1b26b42c868ab2

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,45 @@ class DownloaderForCloud < Downloader
     issue_datas
   end
 
+  def attach_worklogs_to_issues issue_datas:, issue_jsons:, max_results: 100 # rubocop:disable Lint/UnusedMethodArgument
+    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)
+
+        total = response['total'].to_i
+        log "        #{key} worklogs: page startAt=#{start_at}, " \
+            "received=#{worklogs.size}, fetched=#{all_worklogs.size}/#{total}"
+        break if all_worklogs.size >= total
+
+        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 +230,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
@@ -232,11 +272,11 @@ class DownloaderForCloud < Downloader
       end
       break if related_issue_keys.empty?
 
-      unless in_related_phase
-        in_related_phase = true
-        log "  Identifying related issues (parents, subtasks, links) for board #{board.id}", both: true
-        log_start '  Downloading more issues '
-      end
+      next if in_related_phase
+
+      in_related_phase = true
+      log "  Identifying related issues (parents, subtasks, links) for board #{board.id}", both: true
+      log_start '  Downloading more issues '
     end
 
     end_progress if in_related_phase

data/lib/jirametrics/downloader_for_data_center.rb

@@ -49,8 +49,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: File.join(path, file))
+        @file_system.save_json(json: issue_json, filename: issue_path)
+
+        # 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
@@ -63,6 +67,36 @@ class DownloaderForDataCenter < Downloader
     end
   end
 
+  def enhance_issue_with_worklogs issue_key:, issue_path:, max_results: 100
+    all_worklogs = []
+    start_at = 0
+
+    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 += worklogs.size
+    end
+
+    issue_json = @file_system.load_json(issue_path)
+    issue_json['fields'] ||= {}
+    issue_json['fields']['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
+
   def make_jql filter_id:, today: nil
     today ||= today_in_project_timezone
     segments = []

data/lib/jirametrics/github_gateway.rb

@@ -6,6 +6,13 @@ require 'json'
 class GithubGateway
   attr_reader :repo
 
+  TRANSIENT_ERROR_PATTERNS = (
+    [429, 500, 502, 503, 504].map { |code| "HTTP #{code}" } +
+    ['stream error:']
+  ).freeze
+  MAX_RETRIES = 3
+  REVIEW_STATES = %w[APPROVED CHANGES_REQUESTED].freeze
+
   def initialize repo:, project_keys:, file_system:, raw_pr_cache: {}
     @repo = repo
     @project_keys = project_keys
@@ -20,7 +27,7 @@ class GithubGateway
   end
 
   def fetch_raw_pull_requests since: nil
-    # Note: 'commits' is intentionally excluded — including it triggers GitHub's GraphQL node
+    # NOTE: 'commits' is intentionally excluded — including it triggers GitHub's GraphQL node
     # limit (authors sub-connection × PRs × commits exceeds 500,000 nodes). Branch name,
     # title, and body are sufficient for issue key extraction in the vast majority of cases.
     json_fields = %w[number title body headRefName createdAt closedAt mergedAt
@@ -72,7 +79,7 @@ class GithubGateway
 
   def extract_reviews raw_reviews
     raw_reviews
-      .select { |r| %w[APPROVED CHANGES_REQUESTED].include?(r['state']) }
+      .select { |r| REVIEW_STATES.include?(r['state']) }
       .map do |r|
         {
           'author'       => r.dig('author', 'login'),
@@ -100,16 +107,36 @@ class GithubGateway
   end
 
   def run_command args
-    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
+    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?
+        error_message = "  GitHub CLI command failed for #{@repo} " \
+                        "(attempt #{attempts}/#{MAX_RETRIES}): #{stderr.strip}"
+        if attempts < MAX_RETRIES && TRANSIENT_ERROR_PATTERNS.any? { |pattern| stderr.include?(pattern) }
+          delay = 2**attempts
+          @file_system.log error_message
+          @file_system.log "  Transient error detected. Retrying in #{delay}s..."
+          sleep delay
+          next
+        end
+        @file_system.warning error_message
+        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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jirametrics
 version: !ruby/object:Gem::Version
-  version: 2.30.1pre1
+  version: 2.30.1pre5
 platform: ruby
 authors:
 - Mike Bowler
@@ -210,7 +210,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: []