Merge branch 'main' into feature/issue-5913-move-new-observability-pr…

…imer-page
open-telemetry · Jan 15, 2025 · e51c25a · e51c25a
2 parents 8dfe8b9 + 9a34bc8
commit e51c25a
Show file tree

Hide file tree

Showing 3 changed files with 404 additions and 874 deletions.
diff --git a/data/community/members.yaml b/data/community/members.yaml
@@ -383,6 +383,15 @@ maintainers:
       - erlang-maintainers
     html_url: https://github.com/deadtrickster
     avatar_url: https://avatars.githubusercontent.com/u/172311?v=4
+  - name: dineshg13
+    teams:
+      - go-compile-instrumentation-approvers
+      - go-compile-instrumentation-maintainers
+      - go-compile-instrumentation-triagers
+      - go-instrumentation-approvers
+      - go-instrumentation-triagers
+    html_url: https://github.com/dineshg13
+    avatar_url: https://avatars.githubusercontent.com/u/2471669?v=4
   - name: djaglowski
     teams:
       - collector-approvers
@@ -858,6 +867,9 @@ maintainers:
     avatar_url: https://avatars.githubusercontent.com/u/5618424?v=4
   - name: pdelewski
     teams:
+      - go-compile-instrumentation-approvers
+      - go-compile-instrumentation-maintainers
+      - go-compile-instrumentation-triagers
       - go-instrumentation-approvers
       - go-instrumentation-maintainers
       - go-instrumentation-triagers
@@ -937,6 +949,13 @@ maintainers:
       - dotnet-triagers
     html_url: https://github.com/rajkumar-rangaraj
     avatar_url: https://avatars.githubusercontent.com/u/9479006?v=4
+  - name: ralf0131
+    teams:
+      - go-compile-instrumentation-approvers
+      - go-compile-instrumentation-maintainers
+      - go-compile-instrumentation-triagers
+    html_url: https://github.com/ralf0131
+    avatar_url: https://avatars.githubusercontent.com/u/4397305?v=4
   - name: rapphil
     teams:
       - lambda-extension-approvers
@@ -1349,12 +1368,6 @@ approvers:
       - cpp-contrib-approvers
     html_url: https://github.com/DebajitDas
     avatar_url: https://avatars.githubusercontent.com/u/85024550?v=4
-  - name: dineshg13
-    teams:
-      - go-instrumentation-approvers
-      - go-instrumentation-triagers
-    html_url: https://github.com/dineshg13
-    avatar_url: https://avatars.githubusercontent.com/u/2471669?v=4
   - name: dpauls
     teams:
       - semconv-messaging-approvers

diff --git a/gulp-src/prune.js b/gulp-src/prune.js
@@ -29,7 +29,7 @@ async function pruneTask() {
     num: {
       alias: 'n',
       type: 'number',
-      description: 'Maximum number of entries to prune.',
+      description: 'Maximum number of date-based entries to prune.',
       default: n_default,
     },
     before: {
@@ -102,7 +102,7 @@ async function pruneTask() {
           pruneCandidatesByDate__sorted.length
         } entries as prune candidates for before-date ${formattedDate(
           beforeDate,
-        )}.`,
+        )}. Number of date-based entries to delete: ${n}.`,
       );
     }
 
@@ -112,15 +112,16 @@ async function pruneTask() {
     if (list) {
       listEntries(keysToPrune, entries);
       return;
-    } else if (n == 0) {
+    } else if (n == 0 && numEntriesWith4xxStatus == 0) {
       console.log(
-        `WARN: num is ${n} so no entries will be pruned by date. Specify number of entries to prune as --num <n>. For more info use --info`,
+        `WARN: num is ${n} so no date-based entries will be pruned by date. Specify number of entries to prune as --num <n>. For more info use --info`,
       );
-      if (numEntriesWith4xxStatus == 0) return;
     }
 
-    keysToPrune.forEach((key) => delete entries[key]);
-    console.log(`INFO: ${keysToPrune.length} entries pruned.`);
+    if (n > 0) keysToPrune.forEach((key) => delete entries[key]);
+    const deleteCount =
+      Math.min(n, keysToPrune.length) + numEntriesWith4xxStatus;
+    console.log(`INFO: ${deleteCount} entries pruned.`);
     const prettyJson = JSON.stringify(entries, null, 2) + '\n';
     await fs.writeFile(refcacheFile, prettyJson, 'utf8');
   } catch (err) {