Skip to content

Commit 3d31677

Browse files
committed
fix unrelated test in emf exporter
1 parent b491efc commit 3d31677

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

aws-distro-opentelemetry-node-autoinstrumentation/test/exporter/aws/metrics/aws-cloudwatch-emf-exporter.test.ts

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -609,7 +609,7 @@ describe('TestAWSCloudWatchEMFExporter', () => {
609609
});
610610
});
611611

612-
it('TestExportCallsSendLogBatchWithExpectedInput', async () => {
612+
it('TestExportCallsSendLogBatchWithExpectedInput', done => {
613613
const timeInSeconds = Math.round(Date.now() / 1000);
614614

615615
const resourceMetricsData: ResourceMetrics = {
@@ -659,24 +659,22 @@ describe('TestAWSCloudWatchEMFExporter', () => {
659659
const logClientSendLogBatchStub = sinon.stub(exporter['logClient'], 'sendLogBatch' as any);
660660
sinon.stub(exporter['logClient'], 'eventBatchExceedsLimit' as any).returns(true);
661661

662-
await new Promise<void>(resolve => {
663-
exporter.export(resourceMetricsData, result => {
664-
expect(result.code).toEqual(ExportResultCode.FAILED);
665-
666-
sinon.assert.calledThrice(logClientSendLogBatchStub);
667-
const call1Args = logClientSendLogBatchStub.getCall(0).args[0] as LogEventBatch;
668-
const call2Args = logClientSendLogBatchStub.getCall(1).args[0] as LogEventBatch;
669-
const call3Args = logClientSendLogBatchStub.getCall(2).args[0] as LogEventBatch;
670-
671-
expect(call1Args.logEvents.length).toEqual(0);
672-
expect(call2Args.logEvents[0].message).toMatch(
673-
/^\{"_aws":\{"Timestamp":\d+,"CloudWatchMetrics":\[\{"Namespace":"TestNamespace","Metrics":\[\{"Name":"descriptorName","Unit":"Milliseconds"\}\],"Dimensions":\[\["uniqueKey1"\]\]\}\]},"Version":"1","descriptorName":3,"uniqueKey1":"uniqueValue1"\}$/
674-
);
675-
expect(call3Args.logEvents[0].message).toMatch(
676-
/^\{"_aws":\{"Timestamp":\d+,"CloudWatchMetrics":\[\{"Namespace":"TestNamespace","Metrics":\[\{"Name":"descriptorName","Unit":"Milliseconds"\}\],"Dimensions":\[\["uniqueKey2"\]\]\}\]},"Version":"1","descriptorName":9,"uniqueKey2":"uniqueValue2"\}$/
677-
);
678-
resolve();
679-
});
662+
exporter.export(resourceMetricsData, result => {
663+
expect(result.code).toEqual(ExportResultCode.SUCCESS);
664+
665+
sinon.assert.calledThrice(logClientSendLogBatchStub);
666+
const call1Args = logClientSendLogBatchStub.getCall(0).args[0] as LogEventBatch;
667+
const call2Args = logClientSendLogBatchStub.getCall(1).args[0] as LogEventBatch;
668+
const call3Args = logClientSendLogBatchStub.getCall(2).args[0] as LogEventBatch;
669+
670+
expect(call1Args.logEvents.length).toEqual(0);
671+
expect(call2Args.logEvents[0].message).toMatch(
672+
/^\{"_aws":\{"Timestamp":\d+,"CloudWatchMetrics":\[\{"Namespace":"TestNamespace","Metrics":\[\{"Name":"descriptorName","Unit":"Milliseconds"\}\],"Dimensions":\[\["uniqueKey1"\]\]\}\]},"Version":"1","descriptorName":3,"uniqueKey1":"uniqueValue1"\}$/
673+
);
674+
expect(call3Args.logEvents[0].message).toMatch(
675+
/^\{"_aws":\{"Timestamp":\d+,"CloudWatchMetrics":\[\{"Namespace":"TestNamespace","Metrics":\[\{"Name":"descriptorName","Unit":"Milliseconds"\}\],"Dimensions":\[\["uniqueKey2"\]\]\}\]},"Version":"1","descriptorName":9,"uniqueKey2":"uniqueValue2"\}$/
676+
);
677+
done();
680678
});
681679
});
682680

0 commit comments

Comments
 (0)