Skip to content

Commit a8d736b

Browse files
authored
fix: Use 'adaptMetric' in all places where it was missing (Lambda, DDB, SQS) (#173)
Fixes #172 --- _By submitting this pull request, I confirm that my contribution is made under the terms of the Apache-2.0 license_
1 parent 3d09d03 commit a8d736b

File tree

5 files changed

+41
-32
lines changed

5 files changed

+41
-32
lines changed

API.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38958,7 +38958,7 @@ new DynamoTableMetricFactory(metricFactory: MetricFactory, props: DynamoTableMet
3895838958
##### `metricAverageSuccessfulRequestLatencyInMillis` <a name="metricAverageSuccessfulRequestLatencyInMillis" id="cdk-monitoring-constructs.DynamoTableMetricFactory.metricAverageSuccessfulRequestLatencyInMillis"></a>
3895938959

3896038960
```typescript
38961-
public metricAverageSuccessfulRequestLatencyInMillis(operation: Operation): Metric
38961+
public metricAverageSuccessfulRequestLatencyInMillis(operation: Operation): Metric | MathExpression
3896238962
```
3896338963

3896438964
###### `operation`<sup>Required</sup> <a name="operation" id="cdk-monitoring-constructs.DynamoTableMetricFactory.metricAverageSuccessfulRequestLatencyInMillis.parameter.operation"></a>
@@ -41915,7 +41915,7 @@ new LambdaFunctionMetricFactory(metricFactory: MetricFactory, props: LambdaFunct
4191541915
##### `metricConcurrentExecutions` <a name="metricConcurrentExecutions" id="cdk-monitoring-constructs.LambdaFunctionMetricFactory.metricConcurrentExecutions"></a>
4191641916

4191741917
```typescript
41918-
public metricConcurrentExecutions(): Metric
41918+
public metricConcurrentExecutions(): Metric | MathExpression
4191941919
```
4192041920

4192141921
##### `metricFaultCount` <a name="metricFaultCount" id="cdk-monitoring-constructs.LambdaFunctionMetricFactory.metricFaultCount"></a>
@@ -41963,13 +41963,13 @@ public metricLatencyP99InMillis(): Metric | MathExpression
4196341963
##### `metricMaxIteratorAgeInMillis` <a name="metricMaxIteratorAgeInMillis" id="cdk-monitoring-constructs.LambdaFunctionMetricFactory.metricMaxIteratorAgeInMillis"></a>
4196441964

4196541965
```typescript
41966-
public metricMaxIteratorAgeInMillis(): Metric
41966+
public metricMaxIteratorAgeInMillis(): Metric | MathExpression
4196741967
```
4196841968

4196941969
##### `metricProvisionedConcurrencySpilloverInvocations` <a name="metricProvisionedConcurrencySpilloverInvocations" id="cdk-monitoring-constructs.LambdaFunctionMetricFactory.metricProvisionedConcurrencySpilloverInvocations"></a>
4197041970

4197141971
```typescript
41972-
public metricProvisionedConcurrencySpilloverInvocations(): Metric
41972+
public metricProvisionedConcurrencySpilloverInvocations(): Metric | MathExpression
4197341973
```
4197441974

4197541975
##### `metricProvisionedConcurrencySpilloverRate` <a name="metricProvisionedConcurrencySpilloverRate" id="cdk-monitoring-constructs.LambdaFunctionMetricFactory.metricProvisionedConcurrencySpilloverRate"></a>
@@ -46111,7 +46111,7 @@ public metricConsumptionRate(): Metric | MathExpression
4611146111
##### `metricDeletedMessageCount` <a name="metricDeletedMessageCount" id="cdk-monitoring-constructs.SqsQueueMetricFactory.metricDeletedMessageCount"></a>
4611246112

4611346113
```typescript
46114-
public metricDeletedMessageCount(): Metric
46114+
public metricDeletedMessageCount(): Metric | MathExpression
4611546115
```
4611646116

4611746117
##### `metricIncomingMessageCount` <a name="metricIncomingMessageCount" id="cdk-monitoring-constructs.SqsQueueMetricFactory.metricIncomingMessageCount"></a>

lib/monitoring/aws-dynamo/DynamoTableMetricFactory.ts

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,16 @@ export class DynamoTableMetricFactory {
106106
}
107107

108108
metricAverageSuccessfulRequestLatencyInMillis(operation: Operation) {
109-
return this.table.metric("SuccessfulRequestLatency", {
110-
statistic: MetricStatistic.AVERAGE,
111-
label: operation,
112-
dimensionsMap: {
113-
TableName: this.table.tableName,
114-
Operation: operation,
115-
},
116-
});
109+
return this.metricFactory.adaptMetric(
110+
this.table.metric("SuccessfulRequestLatency", {
111+
statistic: MetricStatistic.AVERAGE,
112+
label: operation,
113+
dimensionsMap: {
114+
TableName: this.table.tableName,
115+
Operation: operation,
116+
},
117+
})
118+
);
117119
}
118120

119121
metricThrottledReadRequestCount() {

lib/monitoring/aws-lambda/LambdaFunctionEnhancedMetricFactory.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,11 @@ export class LambdaFunctionEnhancedMetricFactory {
7373
}
7474

7575
private enhancedMetricFunctionDuration() {
76-
return this.lambdaFunction.metricDuration({
77-
statistic: MetricStatistic.SUM,
78-
});
76+
return this.metricFactory.adaptMetric(
77+
this.lambdaFunction.metricDuration({
78+
statistic: MetricStatistic.SUM,
79+
})
80+
);
7981
}
8082

8183
private enhancedMetric(

lib/monitoring/aws-lambda/LambdaFunctionMetricFactory.ts

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -139,19 +139,20 @@ export class LambdaFunctionMetricFactory {
139139
}
140140

141141
metricConcurrentExecutions() {
142-
return this.lambdaFunction.metric("ConcurrentExecutions", {
143-
statistic: MetricStatistic.MAX,
144-
label: "Concurrent",
145-
});
142+
return this.metricFactory.adaptMetric(
143+
this.lambdaFunction.metric("ConcurrentExecutions", {
144+
statistic: MetricStatistic.MAX,
145+
label: "Concurrent",
146+
})
147+
);
146148
}
147149

148150
metricProvisionedConcurrencySpilloverInvocations() {
149-
return this.lambdaFunction.metric(
150-
"ProvisionedConcurrencySpilloverInvocations",
151-
{
151+
return this.metricFactory.adaptMetric(
152+
this.lambdaFunction.metric("ProvisionedConcurrencySpilloverInvocations", {
152153
statistic: MetricStatistic.SUM,
153154
label: "Provisioned Concurrency Spillovers",
154-
}
155+
})
155156
);
156157
}
157158

@@ -166,9 +167,11 @@ export class LambdaFunctionMetricFactory {
166167
}
167168

168169
metricMaxIteratorAgeInMillis() {
169-
return this.lambdaFunction.metric("IteratorAge", {
170-
statistic: MetricStatistic.MAX,
171-
label: "Iterator Age",
172-
});
170+
return this.metricFactory.adaptMetric(
171+
this.lambdaFunction.metric("IteratorAge", {
172+
statistic: MetricStatistic.MAX,
173+
label: "Iterator Age",
174+
})
175+
);
173176
}
174177
}

lib/monitoring/aws-sqs/SqsQueueMetricFactory.ts

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,12 @@ export class SqsQueueMetricFactory {
3333
}
3434

3535
metricDeletedMessageCount() {
36-
return this.queue.metricNumberOfMessagesDeleted({
37-
statistic: MetricStatistic.SUM,
38-
label: "Deleted",
39-
});
36+
return this.metricFactory.adaptMetric(
37+
this.queue.metricNumberOfMessagesDeleted({
38+
statistic: MetricStatistic.SUM,
39+
label: "Deleted",
40+
})
41+
);
4042
}
4143

4244
metricApproximateAgeOfOldestMessageInSeconds() {

0 commit comments

Comments
 (0)