Skip to content

Commit

Permalink
Merge pull request #15 from jorgevrgs/development
Browse files Browse the repository at this point in the history
feat: migrate powertools to 2.8.0
  • Loading branch information
jorgevrgs committed Sep 20, 2024
2 parents 26d1ced + 698b6ee commit 25c5ab1
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 55 deletions.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fastify-aws-powertools",
"version": "0.0.13",
"version": "0.0.14",
"description": "",
"exports": {
"node": {
Expand Down Expand Up @@ -32,13 +32,13 @@
},
"homepage": "https://github.com/jorgevrgs/fastify-aws-powertools#readme",
"dependencies": {
"@aws-lambda-powertools/logger": "2.7.0",
"@aws-lambda-powertools/metrics": "2.7.0",
"@aws-lambda-powertools/tracer": "2.7.0",
"@aws-lambda-powertools/logger": "2.8.0",
"@aws-lambda-powertools/metrics": "2.8.0",
"@aws-lambda-powertools/tracer": "2.8.0",
"fastify-plugin": "^4.5.1"
},
"devDependencies": {
"@aws-lambda-powertools/commons": "2.7.0",
"@aws-lambda-powertools/commons": "2.8.0",
"@biomejs/biome": "^1.8.3",
"@fastify/aws-lambda": "^3.1.3",
"@tsconfig/recommended": "^1.0.1",
Expand Down
46 changes: 23 additions & 23 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

35 changes: 8 additions & 27 deletions test/integration/metrics.test.ts
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
import { randomUUID } from 'node:crypto';
import { Metrics } from '@aws-lambda-powertools/metrics';
import type { PromiseHandler } from '@fastify/aws-lambda';
import awsLambdaFastify from '@fastify/aws-lambda';
import type { APIGatewayProxyEventV2 } from 'aws-lambda';
import type { FastifyInstance } from 'fastify';
import Fastify from 'fastify';
import fp from 'fastify-plugin';
import { randomUUID } from 'node:crypto';
import type { MockInstance } from 'vitest';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import fastifyAwsPowertool from '../../src';
import type { MetricRecords } from '../../src/types';
import { dummyContext } from '../fixtures/context';
import { dummyEvent } from '../fixtures/event';

Expand Down Expand Up @@ -83,24 +82,19 @@ describe('fastifyAwsPowertool metrics integration', () => {
// Second call
await handler(dummyEvent, dummyContext);

const parsedData = consoleSpy.mock.calls.map((value) => {
const parsed = JSON.parse(
value as unknown as string,
) as unknown as MetricRecords;
expect(consoleSpy.mock.calls).toHaveLength(1);

return parsed;
});
// @ts-expect-error - accessing unknown property for testing
const loggedData = JSON.parse(consoleSpy.mock.calls[0][0]);

expect(consoleSpy.mock.calls).toHaveLength(2);
expect(parsedData[0]._aws.CloudWatchMetrics[0].Metrics.length).toBe(1);
expect(parsedData[0]._aws.CloudWatchMetrics[0].Metrics[0].Name).toBe(
expect(loggedData._aws.CloudWatchMetrics[0].Metrics.length).toBe(1);
expect(loggedData._aws.CloudWatchMetrics[0].Metrics[0].Name).toBe(
'ColdStart',
);
expect(parsedData[0]._aws.CloudWatchMetrics[0].Metrics[0].Unit).toBe(
expect(loggedData._aws.CloudWatchMetrics[0].Metrics[0].Unit).toBe(
'Count',
);
expect(parsedData[0].ColdStart).toBe(1);
expect(parsedData[1].ColdStart).toBeUndefined();
expect(loggedData.ColdStart).toBe(1);
});

it('should not capture cold start metrics if set to false', async () => {
Expand Down Expand Up @@ -134,19 +128,6 @@ describe('fastifyAwsPowertool metrics integration', () => {
await handler(dummyEvent, dummyContext);
await handler(dummyEvent, dummyContext);

const parsedData = consoleSpy.mock.calls.map((value) => {
const parsed = JSON.parse(
value as unknown as string,
) as unknown as MetricRecords;

return parsed;
});

expect(parsedData[0]._aws.CloudWatchMetrics[0].Dimensions).not.contains({
Name: 'ColdStart',
Unit: 'Count',
});
expect(parsedData[0].ColdStart).toBeUndefined();
expect(consoleLogSpy).to.not.toHaveBeenCalled();
});
});
Expand Down

0 comments on commit 25c5ab1

Please sign in to comment.