Skip to content

Commit 9595bb9

Browse files
dreamorosidreamorosi
committed
chore: format metrics package
1 parent 3755d53 commit 9595bb9

18 files changed

+35
-42
lines changed

‎packages/metrics/src/Metrics.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { Console } from 'node:console';
2-
import { Utility, isIntegerNumber } from '@aws-lambda-powertools/commons';
2+
import { isIntegerNumber, Utility } from '@aws-lambda-powertools/commons';
33
import type {
44
GenericLogger,
55
HandlerMethodDecorator,
@@ -12,8 +12,8 @@ import {
1212
EMF_MAX_TIMESTAMP_FUTURE_AGE,
1313
EMF_MAX_TIMESTAMP_PAST_AGE,
1414
MAX_DIMENSION_COUNT,
15-
MAX_METRICS_SIZE,
1615
MAX_METRIC_VALUES_SIZE,
16+
MAX_METRICS_SIZE,
1717
MetricResolution as MetricResolutions,
1818
MetricUnit as MetricUnits,
1919
} from './constants.js';
@@ -24,9 +24,9 @@ import type {
2424
ExtraOptions,
2525
MetricDefinition,
2626
MetricResolution,
27-
MetricUnit,
2827
MetricsInterface,
2928
MetricsOptions,
29+
MetricUnit,
3030
StoredMetrics,
3131
} from './types/index.js';
3232

@@ -753,7 +753,7 @@ class Metrics extends Utility implements MetricsInterface {
753753

754754
return {
755755
_aws: {
756-
Timestamp: this.#timestamp ?? new Date().getTime(),
756+
Timestamp: this.#timestamp ?? Date.now(),
757757
CloudWatchMetrics: [
758758
{
759759
Namespace: this.namespace || DEFAULT_NAMESPACE,
@@ -764,6 +764,7 @@ class Metrics extends Utility implements MetricsInterface {
764764
},
765765
...this.defaultDimensions,
766766
...this.dimensions,
767+
// biome-ignore lint/performance/noAccumulatingSpread: need to merge all dimension sets
767768
...this.dimensionSets.reduce((acc, dims) => Object.assign(acc, dims), {}),
768769
...metricValues,
769770
...this.metadata,
@@ -1101,7 +1102,7 @@ class Metrics extends Utility implements MetricsInterface {
11011102
}
11021103

11031104
const timestampMs = isDate ? timestamp.getTime() : timestamp;
1104-
const currentTime = new Date().getTime();
1105+
const currentTime = Date.now();
11051106

11061107
const minValidTimestamp = currentTime - EMF_MAX_TIMESTAMP_PAST_AGE;
11071108
const maxValidTimestamp = currentTime + EMF_MAX_TIMESTAMP_FUTURE_AGE;

‎packages/metrics/src/index.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1+
export { MetricResolution, MetricUnit } from './constants.js';
12
export { Metrics } from './Metrics.js';
2-
export { MetricUnit, MetricResolution } from './constants.js';

‎packages/metrics/src/types/index.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1+
export type { ConfigServiceInterface } from './ConfigServiceInterface.js';
12
export type {
2-
MetricsOptions,
33
Dimensions,
44
EmfOutput,
55
ExtraOptions,
6-
StoredMetrics,
7-
StoredMetric,
86
MetricDefinition,
97
MetricResolution,
10-
MetricUnit,
118
MetricsInterface,
9+
MetricsOptions,
10+
MetricUnit,
11+
StoredMetric,
12+
StoredMetrics,
1213
} from './Metrics.js';
13-
export type { ConfigServiceInterface } from './ConfigServiceInterface.js';

‎packages/metrics/tests/e2e/basicFeatures.decorator.test.functionCode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { LambdaInterface } from '@aws-lambda-powertools/commons/types';
22
import type { Context } from 'aws-lambda';
3-
import { MetricUnit, Metrics } from '../../src/index.js';
3+
import { Metrics, MetricUnit } from '../../src/index.js';
44
import type { MetricUnit as MetricUnitType } from '../../src/types/index.js';
55

66
const namespace = process.env.EXPECTED_NAMESPACE ?? 'CdkExample';

‎packages/metrics/tests/e2e/basicFeatures.decorators.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { join } from 'node:path';
22
import {
3-
TestStack,
43
invokeFunction,
4+
TestStack,
55
} from '@aws-lambda-powertools/testing-utils';
66
import {
77
CloudWatchClient,
@@ -10,7 +10,7 @@ import {
1010
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
1111
import { getMetrics, sortDimensions } from '../helpers/metricsUtils.js';
1212
import { MetricsTestNodejsFunction } from '../helpers/resources.js';
13-
import { RESOURCE_NAME_PREFIX, commonEnvironmentVars } from './constants.js';
13+
import { commonEnvironmentVars, RESOURCE_NAME_PREFIX } from './constants.js';
1414

1515
describe('Metrics E2E tests, basic features decorator usage', () => {
1616
const testStack = new TestStack({
@@ -92,7 +92,7 @@ describe('Metrics E2E tests, basic features decorator usage', () => {
9292

9393
// Check coldstart metric value
9494
const adjustedStartTime = new Date(startTime.getTime() - 60 * 1000);
95-
const endTime = new Date(new Date().getTime() + 60 * 1000);
95+
const endTime = new Date(Date.now() + 60 * 1000);
9696
const coldStartMetricStat = await cloudwatchClient.send(
9797
new GetMetricStatisticsCommand({
9898
Namespace: expectedNamespace,
@@ -150,7 +150,7 @@ describe('Metrics E2E tests, basic features decorator usage', () => {
150150

151151
// Check coldstart metric value
152152
const adjustedStartTime = new Date(startTime.getTime() - 3 * 60 * 1000);
153-
const endTime = new Date(new Date().getTime() + 60 * 1000);
153+
const endTime = new Date(Date.now() + 60 * 1000);
154154
const metricStat = await cloudwatchClient.send(
155155
new GetMetricStatisticsCommand({
156156
Namespace: expectedNamespace,

‎packages/metrics/tests/e2e/basicFeatures.manual.test.functionCode.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { Context } from 'aws-lambda';
2-
import { MetricUnit, Metrics } from '../../src/index.js';
2+
import { Metrics, MetricUnit } from '../../src/index.js';
33
import type { MetricUnit as MetricUnitType } from '../../src/types/index.js';
44

55
const namespace = process.env.EXPECTED_NAMESPACE ?? 'CdkExample';

‎packages/metrics/tests/e2e/basicFeatures.manual.test.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { join } from 'node:path';
22
import {
3-
TestStack,
43
invokeFunction,
4+
TestStack,
55
} from '@aws-lambda-powertools/testing-utils';
66
import {
77
CloudWatchClient,
@@ -10,7 +10,7 @@ import {
1010
import { afterAll, beforeAll, describe, expect, it } from 'vitest';
1111
import { getMetrics, sortDimensions } from '../helpers/metricsUtils.js';
1212
import { MetricsTestNodejsFunction } from '../helpers/resources.js';
13-
import { RESOURCE_NAME_PREFIX, commonEnvironmentVars } from './constants.js';
13+
import { commonEnvironmentVars, RESOURCE_NAME_PREFIX } from './constants.js';
1414

1515
describe('Metrics E2E tests, manual usage', () => {
1616
const testStack = new TestStack({
@@ -78,7 +78,7 @@ describe('Metrics E2E tests, manual usage', () => {
7878

7979
// Check coldstart metric value
8080
const adjustedStartTime = new Date(startTime.getTime() - 60 * 1000);
81-
const endTime = new Date(new Date().getTime() + 60 * 1000);
81+
const endTime = new Date(Date.now() + 60 * 1000);
8282
const coldStartMetricStat = await cloudwatchClient.send(
8383
new GetMetricStatisticsCommand({
8484
Namespace: expectedNamespace,
@@ -136,7 +136,7 @@ describe('Metrics E2E tests, manual usage', () => {
136136

137137
// Check coldstart metric value
138138
const adjustedStartTime = new Date(startTime.getTime() - 3 * 60 * 1000);
139-
const endTime = new Date(new Date().getTime() + 60 * 1000);
139+
const endTime = new Date(Date.now() + 60 * 1000);
140140
const metricStat = await cloudwatchClient.send(
141141
new GetMetricStatisticsCommand({
142142
Namespace: expectedNamespace,

‎packages/metrics/tests/tsconfig.json‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,5 @@
44
"rootDir": "../../",
55
"noEmit": true
66
},
7-
"include": [
8-
"../../testing/src/setupEnv.ts",
9-
"../src/**/*",
10-
"./**/*"
11-
]
7+
"include": ["../../testing/src/setupEnv.ts", "../src/**/*", "./**/*"]
128
}

‎packages/metrics/tests/unit/coldStartMetric.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import { beforeEach, describe, expect, it, vi } from 'vitest';
22
import { COLD_START_METRIC, DEFAULT_NAMESPACE } from '../../src/constants.js';
3-
import { MetricUnit, Metrics } from '../../src/index.js';
3+
import { Metrics, MetricUnit } from '../../src/index.js';
44

55
describe('ColdStart metric', () => {
66
const ENVIRONMENT_VARIABLES = process.env;

‎packages/metrics/tests/unit/creatingMetrics.test.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {
44
MAX_METRICS_SIZE,
55
MetricResolution,
66
} from '../../src/constants.js';
7-
import { MetricUnit, Metrics } from '../../src/index.js';
7+
import { Metrics, MetricUnit } from '../../src/index.js';
88

99
describe('Creating metrics', () => {
1010
const ENVIRONMENT_VARIABLES = process.env;

0 commit comments

Comments
 (0)