fix: update tests to match implementation

Author: matteofigus

packages/metrics/src/Metrics.ts

@@ -200,12 +200,6 @@ class Metrics extends Utility implements MetricsInterface {
    */
   private storedMetrics: StoredMetrics = {};
 
-  /**
-   * Storage for dimension sets
-   * @default []
-   */
-  private dimensionSets: DimensionSet[] = [];
-
   /**
    * Whether to disable metrics
    */
@@ -220,7 +214,6 @@ class Metrics extends Utility implements MetricsInterface {
     super();
 
     this.dimensions = {};
-    this.dimensionSets = [];
     this.setOptions(options);
     this.#logger = options.logger || this.console;
   }
@@ -298,40 +291,8 @@ class Metrics extends Utility implements MetricsInterface {
    * @param dimensions - An object with key-value pairs of dimensions
    */
   public addDimensions(dimensions: Dimensions): void {
-    const dimensionSet: string[] = [];
-
-    // Add default dimensions to the set
-    for (const name of Object.keys(this.defaultDimensions)) {
-      dimensionSet.push(name);
-    }
-
-    // Add new dimensions to both the dimension set and the dimensions object
     for (const [name, value] of Object.entries(dimensions)) {
-      if (!value) {
-        this.#logger.warn(
-          `The dimension ${name} doesn't meet the requirements and won't be added. Ensure the dimension name and value are non empty strings`
-        );
-        continue;
-      }
-
-      if (MAX_DIMENSION_COUNT <= this.getCurrentDimensionsCount() + 1) {
-        throw new RangeError(
-          `The number of metric dimensions must be lower than ${MAX_DIMENSION_COUNT}`
-        );
-      }
-
-      // Add to dimensions object for value storage
-      this.dimensions[name] = value;
-
-      // Add to dimension set if not already included
-      if (!dimensionSet.includes(name)) {
-        dimensionSet.push(name);
-      }
-    }
-
-    // Only add the dimension set if it has dimensions beyond the defaults
-    if (dimensionSet.length > Object.keys(this.defaultDimensions).length) {
-      this.dimensionSets.push(dimensionSet);
+      this.addDimension(name, value);
     }
   }
 
@@ -521,7 +482,6 @@ class Metrics extends Utility implements MetricsInterface {
    */
   public clearDimensions(): void {
     this.dimensions = {};
-    this.dimensionSets = [];
   }
 
   /**
@@ -775,21 +735,13 @@ class Metrics extends Utility implements MetricsInterface {
       ]),
     ];
 
-    // Prepare all dimension sets for the EMF output
-    const allDimensionSets: DimensionSet[] = [defaultDimensionNames];
-
-    // Add any additional dimension sets created via addDimensions()
-    if (this.dimensionSets.length > 0) {
-      allDimensionSets.push(...this.dimensionSets);
-    }
-
     return {
       _aws: {
         Timestamp: this.#timestamp ?? new Date().getTime(),
         CloudWatchMetrics: [
           {
             Namespace: this.namespace || DEFAULT_NAMESPACE,
-            Dimensions: allDimensionSets,
+            Dimensions: [defaultDimensionNames],
             Metrics: metricDefinitions,
           },
         ],

packages/metrics/tests/unit/dimensions.test.ts

@@ -106,7 +106,7 @@ describe('Working with dimensions', () => {
     );
     expect(console.log).toHaveEmittedMetricWith(
       expect.objectContaining({
-        Dimensions: [['service'], ['service', 'environment', 'commit']],
+        Dimensions: [['service', 'environment', 'commit']],
       })
     );
   });
@@ -133,10 +133,7 @@ describe('Working with dimensions', () => {
     );
     expect(console.log).toHaveEmittedMetricWith(
       expect.objectContaining({
-        Dimensions: [
-          ['service', 'environment', 'dimension1', 'dimension2'],
-          ['service', 'dimension1', 'dimension2'],
-        ],
+        Dimensions: [['service', 'environment', 'dimension1', 'dimension2']],
       })
     );
   });
@@ -162,10 +159,7 @@ describe('Working with dimensions', () => {
     );
     expect(console.log).toHaveEmittedMetricWith(
       expect.objectContaining({
-        Dimensions: [
-          ['service', 'environment', 'region'],
-          ['service', 'region'],
-        ],
+        Dimensions: [['service', 'environment', 'region']],
       })
     );
   });
@@ -329,10 +323,7 @@ describe('Working with dimensions', () => {
     expect(console.log).toHaveEmittedNthMetricWith(
       1,
       expect.objectContaining({
-        Dimensions: [
-          ['service', 'environment'],
-          ['service', 'region'],
-        ],
+        Dimensions: [['service', 'environment', 'region']],
       })
     );
     expect(console.log).toHaveEmittedNthEMFWith(