Merge branch 'main' into chore/nodejs22_switch

Author: dreamorosi

.husky/pre-push

@@ -4,5 +4,4 @@ npm t \
 npx vitest --run \
   --exclude tests/unit/layer-publisher.test.ts \
   --coverage --coverage.thresholds.100 \
-  --changed="$(git merge-base HEAD main)" \
   tests/unit

docs/requirements.in

@@ -1,4 +1,4 @@
 mike==1.1.2
-mkdocs-material==9.5.44
+mkdocs-material==9.5.45
 mkdocs-git-revision-date-plugin==0.3.2
 mkdocs-exclude==1.0.2

docs/requirements.txt

@@ -235,9 +235,9 @@ mkdocs-get-deps==0.2.0 \
 mkdocs-git-revision-date-plugin==0.3.2 \
     --hash=sha256:2e67956cb01823dd2418e2833f3623dee8604cdf223bddd005fe36226a56f6ef
     # via -r requirements.in
-mkdocs-material==9.5.44 \
-    --hash=sha256:47015f9c167d58a5ff5e682da37441fc4d66a1c79334bfc08d774763cacf69ca \
-    --hash=sha256:f3a6c968e524166b3f3ed1fb97d3ed3e0091183b0545cedf7156a2a6804c56c0
+mkdocs-material==9.5.45 \
+    --hash=sha256:286489cf0beca4a129d91d59d6417419c63bceed1ce5cd0ec1fc7e1ebffb8189 \
+    --hash=sha256:a9be237cfd0be14be75f40f1726d83aa3a81ce44808dc3594d47a7a592f44547
     # via -r requirements.in
 mkdocs-material-extensions==1.3.1 \
     --hash=sha256:10c9511cea88f568257f960358a467d12b970e1f7b2c0e5fb2bb48cab1928443 \

package-lock.json

@@ -54,7 +54,7 @@
     "@types/aws-lambda": "^8.10.145",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.9.0",
-    "@vitest/coverage-v8": "^2.1.4",
+    "@vitest/coverage-v8": "^2.1.5",
     "husky": "^9.1.6",
     "jest": "^29.7.0",
     "jest-runner-groups": "^2.2.0",

package.json

@@ -218,6 +218,7 @@ class Metrics extends Utility implements MetricsInterface {
    * Add a dimension to metrics.
    *
    * A dimension is a key-value pair that is used to group metrics, and it is included in all metrics emitted after it is added.
+   * Invalid dimension values are skipped and a warning is logged.
    *
    * When calling the {@link Metrics.publishStoredMetrics | `publishStoredMetrics()`} method, the dimensions are cleared. This type of
    * dimension is useful when you want to add request-specific dimensions to your metrics. If you want to add dimensions that are
@@ -227,6 +228,12 @@ class Metrics extends Utility implements MetricsInterface {
    * @param value - The value of the dimension
    */
   public addDimension(name: string, value: string): void {
+    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`
+      );
+      return;
+    }
     if (MAX_DIMENSION_COUNT <= this.getCurrentDimensionsCount()) {
       throw new RangeError(
         `The number of metric dimensions must be lower than ${MAX_DIMENSION_COUNT}`
@@ -239,6 +246,7 @@ class Metrics extends Utility implements MetricsInterface {
    * Add multiple dimensions to the metrics.
    *
    * This method is useful when you want to add multiple dimensions to the metrics at once.
+   * Invalid dimension values are skipped and a warning is logged.
    *
    * When calling the {@link Metrics.publishStoredMetrics | `publishStoredMetrics()`} method, the dimensions are cleared. This type of
    * dimension is useful when you want to add request-specific dimensions to your metrics. If you want to add dimensions that are
@@ -249,7 +257,14 @@ class Metrics extends Utility implements MetricsInterface {
   public addDimensions(dimensions: Dimensions): void {
     const newDimensions = { ...this.dimensions };
     for (const dimensionName of Object.keys(dimensions)) {
-      newDimensions[dimensionName] = dimensions[dimensionName];
+      const value = dimensions[dimensionName];
+      if (value) {
+        newDimensions[dimensionName] = value;
+      } else {
+        this.#logger.warn(
+          `The dimension ${dimensionName} doesn't meet the requirements and won't be added. Ensure the dimension name and value are non empty strings`
+        );
+      }
     }
     if (Object.keys(newDimensions).length > MAX_DIMENSION_COUNT) {
       throw new RangeError(

packages/metrics/src/Metrics.ts

@@ -431,6 +431,45 @@ describe('Class: Metrics', () => {
         `The number of metric dimensions must be lower than ${MAX_DIMENSION_COUNT}`
       );
     });
+
+    describe('invalid values should not be added as dimensions', () => {
+      const testCases = [
+        { value: undefined as unknown as string, description: 'undefined' },
+        { value: null as unknown as string, description: 'null' },
+        { value: '', description: 'empty string' },
+      ];
+
+      for (const { value, description } of testCases) {
+        it(`it should not add dimension with ${description} value and log a warning`, () => {
+          // Prepare
+          const customLogger = {
+            warn: jest.fn(),
+            debug: jest.fn(),
+            error: jest.fn(),
+            info: jest.fn(),
+          };
+          const metrics: Metrics = new Metrics({
+            namespace: TEST_NAMESPACE,
+            logger: customLogger,
+          });
+          const consoleWarnSpy = jest.spyOn(customLogger, 'warn');
+          const testDimensionName = 'test-dimension';
+
+          // Act
+          metrics.addDimension(testDimensionName, value);
+
+          // Assess
+          expect(consoleWarnSpy).toHaveBeenCalledWith(
+            `The dimension ${testDimensionName} doesn't meet the requirements and won't be added. Ensure the dimension name and value are non empty strings`
+          );
+          expect(metrics).toEqual(
+            expect.objectContaining({
+              dimensions: {},
+            })
+          );
+        });
+      }
+    });
   });
 
   describe('Method: addDimensions', () => {
@@ -520,6 +559,53 @@ describe('Class: Metrics', () => {
         `Unable to add 1 dimensions: the number of metric dimensions must be lower than ${MAX_DIMENSION_COUNT}`
       );
     });
+
+    describe('invalid values should not be added as dimensions', () => {
+      const testCases = [
+        { value: undefined as unknown as string, description: 'undefined' },
+        { value: null as unknown as string, description: 'null' },
+        { value: '', description: 'empty string' },
+      ];
+
+      for (const { value, description } of testCases) {
+        it(`it should not add dimension with ${description} value and log a warning`, () => {
+          // Prepare
+          const customLogger = {
+            warn: jest.fn(),
+            debug: jest.fn(),
+            error: jest.fn(),
+            info: jest.fn(),
+          };
+          const metrics: Metrics = new Metrics({
+            namespace: TEST_NAMESPACE,
+            logger: customLogger,
+          });
+          const consoleWarnSpy = jest.spyOn(customLogger, 'warn');
+          const dimensionsToBeAdded: LooseObject = {
+            'test-dimension-1': 'test-value-1',
+            'test-dimension-2': 'test-value-2',
+          };
+          const testDimensionName = 'test-dimension';
+
+          // Act
+          metrics.addDimensions(dimensionsToBeAdded);
+          metrics.addDimensions({ [testDimensionName]: value });
+
+          // Assess
+          expect(consoleWarnSpy).toHaveBeenCalledWith(
+            `The dimension ${testDimensionName} doesn't meet the requirements and won't be added. Ensure the dimension name and value are non empty strings`
+          );
+          expect(metrics).toEqual(
+            expect.objectContaining({
+              dimensions: {
+                'test-dimension-1': 'test-value-1',
+                'test-dimension-2': 'test-value-2',
+              },
+            })
+          );
+        });
+      }
+    });
   });
 
   describe('Method: addMetadata', () => {

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

@@ -40,7 +40,7 @@ const KafkaBaseEventSchema = z.object({
  * @example
  * ```json
  * {
- *   "eventSource":"aws:SelfManagedKafka",
+ *   "eventSource":"SelfManagedKafka",
  *   "bootstrapServers":"b-2.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092,b-1.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092",
  *   "records":{
  *      "mytopic-0":[
@@ -79,7 +79,7 @@ const KafkaBaseEventSchema = z.object({
  * @see {@link https://docs.aws.amazon.com/lambda/latest/dg/with-kafka.html}
  */
 const KafkaSelfManagedEventSchema = KafkaBaseEventSchema.extend({
-  eventSource: z.literal('aws:SelfManagedKafka'),
+  eventSource: z.literal('SelfManagedKafka'),
 });
 
 /**

packages/parser/src/schemas/kafka.ts

@@ -1,5 +1,5 @@
 {
-  "eventSource": "aws:SelfManagedKafka",
+  "eventSource": "SelfManagedKafka",
   "bootstrapServers": "b-2.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092,b-1.demo-cluster-1.a1bcde.c1.kafka.us-east-1.amazonaws.com:9092",
   "records": {
     "mytopic-0": [