adress review comments

Signed-off-by: ChrsMark <chrismarkou92@gmail.com>

Author: ChrsMark

.github/workflows/scripts/generate-codeowners-activity.js

@@ -5,8 +5,7 @@
  * Generates a monthly report measuring code owner responsiveness. We require (1) at least 75%
  * of each component's PRs to be reviewed by at least one code owner, and (2) each code owner
  * to have reviewed/replied to at least 75% / n of the PRs where they were requested (n =
- * number of code owners for that component). The report can optionally list code owners with
- * below 5% activity over the past 6 months. Uses the same component labels as the weekly
+ * number of code owners for that component). Uses the same component labels as the weekly
  * report (e.g. receiver/kubeletstats).
  */
 
@@ -18,11 +17,6 @@ const REPO_NAME = 'opentelemetry-collector-contrib';
 /** Target: at least this % of each component's PRs must be reviewed (by at least one code owner). */
 const COMPONENT_TARGET_PCT = 75;
 /** Per-code-owner target is COMPONENT_TARGET_PCT / number of code owners for that component (e.g. 75%/3 ≈ 25%). */
-/** Code owners below this % activity over the past 6 months are listed in a separate section (when enabled). */
-const LOW_ACTIVITY_THRESHOLD_PCT = 5;
-const SIX_MONTHS_DAYS = 180;
-/** Set to true to include the "Code owners below 5% activity (past 6 months)" section in the report. */
-const REPORT_LOW_ACTIVITY_6MO = false;
 
 /** PRs created by these logins are excluded from the report. */
 const EXCLUDED_PR_AUTHORS = new Set(['otelbot', 'renovate']);
@@ -39,14 +33,11 @@ const FOCUS_COMPONENT_LABELS = new Set([
 ]);
 // Resourcedetection has sub-labels (e.g. processor/resourcedetection/internal/azure); include those too.
 function isAllowedLabel(label) {
-  if (FOCUS_COMPONENT_LABELS.size === 0) return true;
   if (FOCUS_COMPONENT_LABELS.has(label)) return true;
   if (label.startsWith('processor/resourcedetection/')) return true;
   return false;
 }
 
-// Optional: set LIMIT (e.g. 10) to only process that many PRs and issues (for quick local runs)
-const PROCESS_LIMIT = process.env.LIMIT ? parseInt(process.env.LIMIT, 10) : null;
 const PROGRESS_INTERVAL = 5;
 
 function debug(msg) {
@@ -72,9 +63,7 @@ function genLookbackDates() {
   );
   const thirtyDaysAgo = new Date(midnightYesterday);
   thirtyDaysAgo.setDate(midnightYesterday.getDate() - 30);
-  const sixMonthsAgo = new Date(midnightYesterday);
-  sixMonthsAgo.setDate(midnightYesterday.getDate() - SIX_MONTHS_DAYS);
-  return { thirtyDaysAgo, sixMonthsAgo, midnightYesterday };
+  return { thirtyDaysAgo, midnightYesterday };
 }
 
 function filterOnDateRange({ created_at, thirtyDaysAgo, midnightYesterday }) {
@@ -164,39 +153,6 @@ async function searchIssuesAndPrs(octokit, query, thirtyDaysAgo, midnightYesterd
   return items;
 }
 
-async function getPrsInWindow(octokit, since, until) {
-  return searchIssuesAndPrs(octokit, 'is:pr', since, until);
-}
-
-/**
- * Fetch PRs in date-range chunks to avoid GitHub search 1000-result limit.
- * Returns combined, deduplicated PRs for the full [since, until] window.
- */
-async function getPrsInWindowChunked(octokit, since, until, chunkDays = 30) {
-  const results = [];
-  const seen = new Set();
-  let start = new Date(since);
-  const end = new Date(until);
-  while (start < end) {
-    const chunkEnd = new Date(start);
-    chunkEnd.setDate(chunkEnd.getDate() + chunkDays);
-    if (chunkEnd > end) chunkEnd.setTime(end.getTime());
-    progress(`Fetching PRs ${start.toISOString().slice(0, 10)} – ${chunkEnd.toISOString().slice(0, 10)}...`);
-    const chunk = await searchIssuesAndPrs(octokit, 'is:pr', start, chunkEnd);
-    for (const pr of chunk) {
-      if (seen.has(pr.id)) continue;
-      seen.add(pr.id);
-      results.push(pr);
-    }
-    start = chunkEnd;
-  }
-  return results;
-}
-
-async function getIssuesInWindow(octokit, thirtyDaysAgo, midnightYesterday) {
-  return searchIssuesAndPrs(octokit, 'is:issue', thirtyDaysAgo, midnightYesterday);
-}
-
 function getComponentLabelsOnItem(item, componentLabels) {
   const names = (item.labels || []).map((l) => l.name);
   return names.filter((name) => componentLabels.has(name) && isAllowedLabel(name));
@@ -238,23 +194,6 @@ async function getReviewAndRequestedLogins(octokit, owner, repo, prNumber) {
   return { requested, respondents, draft };
 }
 
-async function getIssueCommentLogins(octokit, owner, repo, issueNumber) {
-  const logins = new Set();
-  try {
-    const { data: comments } = await octokit.issues.listComments({
-      owner,
-      repo,
-      issue_number: issueNumber,
-    });
-    for (const c of comments) {
-      if (c.user && c.user.login) logins.add(c.user.login);
-    }
-  } catch (e) {
-    debug({ msg: 'getIssueCommentLogins error', owner, repo, issueNumber, error: e.message });
-  }
-  return logins;
-}
-
 /**
  * Get per-label code owners: for each label in labelsOnItem, add (label, login) pairs
  * to the given map. Returns Map<login, Set<label>> for quick lookup.
@@ -275,16 +214,13 @@ function getCodeOwnersByLabel(labelsOnItem, labelToOwners) {
 /**
  * Stats aggregated by (code owner, component). Shape: byCodeOwner[login][componentLabel] = { total, responded }.
  * Also returns componentPrStats: per component, how many PRs had at least one code-owner review (for the 75% target).
- * @param {number|null} [processLimitOverride] - If null, process all PRs; if undefined, use global PROCESS_LIMIT.
  */
-async function computePrStats(octokit, prs, labelToOwners, componentLabels, thirtyDaysAgo, midnightYesterday, processLimitOverride) {
+async function computePrStats(octokit, prs, labelToOwners, componentLabels, thirtyDaysAgo, midnightYesterday) {
   const byCodeOwnerAndComponent = {};
   const componentPrStats = {}; // { [component]: { prsTotal, prsWithResponse } }
   let processed = 0;
-  const limit = processLimitOverride !== undefined ? processLimitOverride : PROCESS_LIMIT;
 
   for (const pr of prs) {
-    if (limit !== null && processed >= limit) break;
     if (!filterOnDateRange({ created_at: pr.created_at, thirtyDaysAgo, midnightYesterday })) continue;
     const authorLogin = pr.user?.login || null;
     if (authorLogin && EXCLUDED_PR_AUTHORS.has(authorLogin)) continue;
@@ -334,42 +270,6 @@ async function computePrStats(octokit, prs, labelToOwners, componentLabels, thir
   return { byCodeOwnerAndComponent, componentPrStats };
 }
 
-async function computeIssueStats(octokit, issues, labelToOwners, componentLabels, thirtyDaysAgo, midnightYesterday) {
-  const byCodeOwnerAndComponent = {};
-  let processed = 0;
-
-  for (const issue of issues) {
-    if (PROCESS_LIMIT !== null && processed >= PROCESS_LIMIT) break;
-    if (!filterOnDateRange({ created_at: issue.created_at, thirtyDaysAgo, midnightYesterday })) continue;
-    const labelsOnIssue = getComponentLabelsOnItem(issue, componentLabels);
-    if (labelsOnIssue.length === 0) continue;
-
-    const ownerToLabels = getCodeOwnersByLabel(labelsOnIssue, labelToOwners);
-    if (ownerToLabels.size === 0) continue;
-
-    if (processed === 0 || processed % PROGRESS_INTERVAL === 0) progress(`Issues: fetching #${issue.number} (${processed + 1})...`);
-    const respondents = await getIssueCommentLogins(octokit, REPO_OWNER, REPO_NAME, issue.number);
-    processed++;
-
-    const authorLogin = issue.user?.login || null;
-    for (const [login, labels] of ownerToLabels) {
-      if (authorLogin && login === authorLogin) continue; // do not count this issue for the author (they opened it)
-      for (const label of labels) {
-        if (!byCodeOwnerAndComponent[login]) byCodeOwnerAndComponent[login] = {};
-        if (!byCodeOwnerAndComponent[login][label]) {
-          byCodeOwnerAndComponent[login][label] = { total: 0, responded: 0 };
-        }
-        byCodeOwnerAndComponent[login][label].total++;
-        if (respondents.has(login)) {
-          byCodeOwnerAndComponent[login][label].responded++;
-        }
-      }
-    }
-  }
-
-  return byCodeOwnerAndComponent;
-}
-
 /**
  * Flatten byCodeOwnerAndComponent into rows: one row per (code owner, component).
  * Per-code-owner target is 75% / (number of code owners for that component).
@@ -447,59 +347,19 @@ ${content}
 </details>`;
 }
 
-/**
- * Code owners with &lt; LOW_ACTIVITY_THRESHOLD_PCT response rate over the past 6 months, per component.
- */
-function formatLowActivityCodeOwners(sixMonthByCodeOwner) {
-  const rows = [];
-  for (const [login, byComponent] of Object.entries(sixMonthByCodeOwner)) {
-    for (const [component, v] of Object.entries(byComponent)) {
-      if (v.total === 0) continue;
-      const pct = (100 * v.responded) / v.total;
-      if (pct >= LOW_ACTIVITY_THRESHOLD_PCT) continue;
-      rows.push([login, component, String(v.total), String(v.responded), `${pct.toFixed(1)}%`]);
-    }
-  }
-  rows.sort((a, b) => {
-    const cmpLogin = a[0].localeCompare(b[0]);
-    if (cmpLogin !== 0) return cmpLogin;
-    return a[1].localeCompare(b[1]);
-  });
-
-  if (rows.length === 0) {
-    return `No code owners below ${LOW_ACTIVITY_THRESHOLD_PCT}% activity in the past 6 months.\n`;
-  }
-  const header = `| Code owner | Component | Total requested | Responded | % |`;
-  const sep = '| --- | --- | --- | --- | --- |';
-  const body = rows.map((r) => `| ${r.join(' | ')} |`).join('\n');
-  return `${header}\n${sep}\n${body}\n`;
-}
-
-function generateReport(prStats, componentPrStats, issueStats, lookbackData, lowActivityMarkdown) {
-  const focusNote = FOCUS_COMPONENT_LABELS.size > 0
-    ? `\n\n**Components in scope:** ${[...FOCUS_COMPONENT_LABELS].sort().join(', ')} (and \`processor/resourcedetection/*\` sub-labels).\n`
-    : '';
+function generateReport(prStats, componentPrStats, lookbackData) {
   const out = [
     `## Code owner activity report`,
     ``,
     `Period: ${lookbackData.thirtyDaysAgo.toISOString().slice(0, 10)} – ${lookbackData.midnightYesterday.toISOString().slice(0, 10)}`,
     ``,
-    `We target **at least ${COMPONENT_TARGET_PCT}% of each component's PRs** to be reviewed by a code owner, and each code owner to respond to at least **${COMPONENT_TARGET_PCT}% / n** of their requested PRs (n = number of code owners for that component) ([at least 3 code owners for components aiming for stable](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#beta-to-stable)).${focusNote}`,
+    `We target **at least ${COMPONENT_TARGET_PCT}% of each component's PRs** to be reviewed by a code owner, and each code owner to respond to at least **${COMPONENT_TARGET_PCT}% / n** of their requested PRs (n = number of code owners for that component) ([at least 3 code owners for components aiming for stable](https://github.com/open-telemetry/opentelemetry-collector/blob/main/docs/component-stability.md#beta-to-stable)).`,
     ``,
     `### Component PR review rate (${COMPONENT_TARGET_PCT}% target)`,
     ``,
     formatComponentSummaryTable(prStats, componentPrStats),
     ``,
     collapsibleSection('PRs (per code owner)', formatTable(prStats, 'PRs')),
-    ...(lowActivityMarkdown
-      ? [
-        ``,
-        `### Code owners below ${LOW_ACTIVITY_THRESHOLD_PCT}% activity (past 6 months)`,
-        ``,
-        lowActivityMarkdown,
-      ]
-      : []),
-    // collapsibleSection('Issues', formatTable(issueStats, 'issues')),
   ];
   return out.join('\n');
 }
@@ -534,28 +394,12 @@ async function main({ github, context }) {
     ? new Set([...allLabels].filter(isAllowedLabel))
     : allLabels;
 
-  const prs30 = await getPrsInWindow(octokit, lookbackData.thirtyDaysAgo, lookbackData.midnightYesterday);
-  // const issues = await getIssuesInWindow(octokit, lookbackData.thirtyDaysAgo, lookbackData.midnightYesterday);
-  const issues = [];
-
-  if (PROCESS_LIMIT !== null) {
-    progress(`Limit set: processing up to ${PROCESS_LIMIT} PRs for 30-day stats (set LIMIT= or unset for full run).`);
-  }
+  const prs30 = await searchIssuesAndPrs(octokit, 'is:pr', lookbackData.thirtyDaysAgo, lookbackData.midnightYesterday);
   progress(`Fetched ${prs30.length} PRs (30 days). Processing...`);
 
   const { byCodeOwnerAndComponent: prStats, componentPrStats } = await computePrStats(octokit, prs30, labelToOwners, componentLabels, lookbackData.thirtyDaysAgo, lookbackData.midnightYesterday);
 
-  let lowActivityMarkdown = '';
-  if (REPORT_LOW_ACTIVITY_6MO) {
-    const prs6Mo = await getPrsInWindowChunked(octokit, lookbackData.sixMonthsAgo, lookbackData.midnightYesterday);
-    progress(`Fetched ${prs6Mo.length} PRs (6 months). Computing low-activity stats...`);
-    const { byCodeOwnerAndComponent: sixMonthPrStats } = await computePrStats(octokit, prs6Mo, labelToOwners, componentLabels, lookbackData.sixMonthsAgo, lookbackData.midnightYesterday, null);
-    lowActivityMarkdown = formatLowActivityCodeOwners(sixMonthPrStats);
-  }
-  // const issueStats = await computeIssueStats(octokit, issues, labelToOwners, componentLabels, lookbackData.thirtyDaysAgo, lookbackData.midnightYesterday);
-  const issueStats = {};
-
-  const report = generateReport(prStats, componentPrStats, issueStats, lookbackData, lowActivityMarkdown);
+  const report = generateReport(prStats, componentPrStats, lookbackData);
 
   // Dry run: set DRY_RUN=true or DRY_RUN=1 to print the report without creating an issue.
   const dryRun = process.env.DRY_RUN === 'true' || process.env.DRY_RUN === '1';