Updating labelOptions to be a Set

vck3000 · Jul 5, 2024 · 71a0562 · 71a0562
1 parent 2740fa2
commit 71a0562
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/clients/victoriaMetrics/promMetricCounter.ts b/src/clients/victoriaMetrics/promMetricCounter.ts
@@ -1,11 +1,10 @@
 import promClient, { Counter } from 'prom-client';
 import { promAgent } from './promAgent';
-import { generateLabelCombinations } from './metricFunctions';
 
 export interface CounterConfig {
   name: string;
   help: string;
-  labelOptions?: Record<string, string[]>;
+  labelOptions?: Record<string, Set<string>>;
 }
 
 export interface PromClientCounterConfig {
@@ -29,7 +28,7 @@ export class PromMetricCounter {
     if (counterConfig.labelOptions) {
       const labelNames = Object.keys(counterConfig.labelOptions);
       const invalidLabelNames = labelNames.filter((labelName) => {
-        return counterConfig.labelOptions[labelName].length === 0;
+        return counterConfig.labelOptions[labelName].size === 0;
       });
 
       if (invalidLabelNames.length > 0) {
@@ -44,9 +43,10 @@ export class PromMetricCounter {
     }
 
     if (counterConfig.labelOptions) {
-      this.labelCombinations = generateLabelCombinations(
-        counterConfig.labelOptions,
-      );
+      // TODO-kev: Needs to be fixed
+      // this.labelCombinations = generateLabelCombinations(
+      //   counterConfig.labelOptions,
+      // );
     }
 
     this.counter = new promClient.Counter(promClientCounterConfig);
@@ -60,7 +60,7 @@ export class PromMetricCounter {
 
   public inc(num: number, labels?: Record<string, string>) {
     if (labels) {
-      // this.validateLabelCombination(labels);
+      this.validateLabelCombination(labels);
       this.counter.inc(labels, num);
     } else {
       this.counter.inc(num);

diff --git a/src/metrics/gameMetrics.ts b/src/metrics/gameMetrics.ts
@@ -4,6 +4,6 @@ export const gamesPlayedMetric = new PromMetricCounter({
   name: 'games_played_total',
   help: 'Total number of games played.',
   labelOptions: {
-    status: ['finished', 'voided'],
+    status: new Set(['finished', 'voided', 'finished']),
   },
 });
diff --git a/src/metrics/miscellaneousMetrics.ts b/src/metrics/miscellaneousMetrics.ts
@@ -19,7 +19,7 @@ export const avatarSubmissionsMetric = new PromMetricCounter({
   name: `custom_avatar_submissions_total`,
   help: `Total number of custom avatars submitted/rejected/approved.`,
   labelOptions: {
-    status: ['approved', 'rejected', 'submitted'],
+    status: new Set(['approved', 'rejected', 'submitted']),
   },
 });