Merge branch 'main' into test-deprecations

lib/common/metric/MetricFactory.ts

@@ -150,16 +150,19 @@ export class MetricFactory {
     const finalPeriod =
       period ?? this.globalDefaults.period ?? DefaultMetricPeriod;
     const searchNamespace = this.getNamespaceWithFallback(namespace);
+    const keysWithQuotations = Object.keys(dimensionsMap).map(
+      (key) => `"${key}"`,
+    );
     const namespacePlusDimensionKeys = [
-      searchNamespace,
-      ...Object.keys(dimensionsMap),
+      `"${searchNamespace}"`,
+      ...keysWithQuotations,
     ].join(",");
     const metricSchema = `{${namespacePlusDimensionKeys}}`;
 
     const dimensionKeysAndValues = Object.entries(
       this.removeUndefinedEntries(dimensionsMap),
     )
-      .map(([key, value]) => `${key}="${value}"`)
+      .map(([key, value]) => `"${key}"="${value}"`)
       .join(" ");
 
     const expression = `SEARCH('${metricSchema} ${dimensionKeysAndValues} ${query}', '${statistic}', ${finalPeriod.toSeconds()})`;

lib/common/monitoring/alarms/LatencyAlarmFactory.ts

@@ -166,7 +166,7 @@ export class LatencyAlarmFactory {
         ComparisonOperator.GREATER_THAN_THRESHOLD,
       ...props,
       disambiguator,
-      threshold: props.maxLatency.toMilliseconds(),
+      threshold: props.maxLatency.toMilliseconds({ integral: false }),
       alarmNameSuffix,
       // we will dedupe any kind of latency issue to the same ticket
       alarmDedupeStringSuffix: this.alarmFactory
@@ -200,7 +200,7 @@ export class LatencyAlarmFactory {
         ComparisonOperator.GREATER_THAN_THRESHOLD,
       ...props,
       disambiguator,
-      threshold: props.maxLatency.toMilliseconds(),
+      threshold: props.maxLatency.toMilliseconds({ integral: false }),
       alarmNameSuffix,
       // we will dedupe any kind of latency issue to the same alarm
       alarmDedupeStringSuffix: this.alarmFactory
@@ -230,7 +230,7 @@ export class LatencyAlarmFactory {
         ComparisonOperator.GREATER_THAN_THRESHOLD,
       ...props,
       disambiguator,
-      threshold: props.maxDuration.toMilliseconds(),
+      threshold: props.maxDuration.toMilliseconds({ integral: false }),
       alarmNameSuffix,
       // we will dedupe any kind of latency issue to the same ticket
       alarmDedupeStringSuffix: this.alarmFactory
@@ -264,7 +264,7 @@ export class LatencyAlarmFactory {
         ComparisonOperator.GREATER_THAN_THRESHOLD,
       ...props,
       disambiguator,
-      threshold: props.maxDuration.toMilliseconds(),
+      threshold: props.maxDuration.toMilliseconds({ integral: false }),
       alarmNameSuffix,
       // we will dedupe any kind of latency issue to the same ticket
       alarmDedupeStringSuffix: this.alarmFactory

lib/monitoring/aws-cloudwatch/CloudWatchLogsMetricFactory.ts

@@ -34,7 +34,7 @@ export class CloudWatchLogsMetricFactory extends BaseMetricFactory<CloudWatchLog
   metricIncomingLogEvents() {
     return this.metricFactory.createMetric(
       "IncomingLogEvents",
-      MetricStatistic.N,
+      MetricStatistic.SUM,
       "Logs",
       this.dimensionsMap,
       undefined,

test/common/alarm/LatencyAlarmFactory.test.ts

@@ -0,0 +1,67 @@
+import { Duration, Stack } from "aws-cdk-lib";
+import { Metric } from "aws-cdk-lib/aws-cloudwatch";
+import { Construct } from "constructs";
+
+import {
+  AlarmFactory,
+  AlarmFactoryDefaults,
+  LatencyAlarmFactory,
+  LatencyType,
+  MetricFactoryDefaults,
+  noopAction,
+} from "../../../lib";
+
+const stack = new Stack();
+const construct = new Construct(stack, "SampleConstruct");
+
+const globalMetricDefaults: MetricFactoryDefaults = {
+  namespace: "DummyNamespace",
+};
+const globalAlarmDefaults: AlarmFactoryDefaults = {
+  alarmNamePrefix: "DummyServiceAlarms",
+  actionsEnabled: true,
+  datapointsToAlarm: 6,
+  // we do not care about alarm actions in this test
+  action: noopAction(),
+};
+const factory = new AlarmFactory(construct, {
+  globalMetricDefaults,
+  globalAlarmDefaults,
+  localAlarmNamePrefix: "prefix",
+});
+
+const metric = new Metric({
+  metricName: "DummyMetric1",
+  namespace: "DummyCustomNamespace",
+  dimensionsMap: { CustomDimension: "CustomDimensionValue" },
+});
+
+const latencyAlarmFactory = new LatencyAlarmFactory(factory);
+
+test("addLatencyAlarm: non-integral millisecond thresholds do not throw error", () => {
+  latencyAlarmFactory.addLatencyAlarm(metric, LatencyType.P99, {
+    maxLatency: Duration.millis(0.5),
+  });
+});
+
+test("addIntegrationLatencyAlarm: non-integral millisecond thresholds do not throw error", () => {
+  latencyAlarmFactory.addIntegrationLatencyAlarm(metric, LatencyType.P99, {
+    maxLatency: Duration.millis(2.5),
+  });
+});
+
+test("addDurationAlarm: non-integral millisecond durations do not throw error", () => {
+  latencyAlarmFactory.addDurationAlarm(metric, LatencyType.P99, {
+    maxDuration: Duration.millis(0.5),
+  });
+});
+
+test("addJvmGarbageCollectionDurationAlarm: non-integral millisecond durations do not throw error", () => {
+  latencyAlarmFactory.addJvmGarbageCollectionDurationAlarm(
+    metric,
+    LatencyType.P99,
+    {
+      maxDuration: Duration.millis(2.5),
+    },
+  );
+});