@@ -22,6 +22,7 @@ import * as assert from 'assert';
22
22
import * as sinon from 'sinon' ;
23
23
import { MetricProducer } from '../../src/export/MetricProducer' ;
24
24
import { TimeoutError } from '../../src/utils' ;
25
+ import { assertRejects } from '../test-utils' ;
25
26
26
27
const MAX_32_BIT_INT = 2 ** 31 - 1
27
28
@@ -94,34 +95,34 @@ describe('PeriodicExportingMetricReader', () => {
94
95
}
95
96
) ;
96
97
assert . strictEqual ( reader . getPreferredAggregationTemporality ( ) , exporter . getPreferredAggregationTemporality ( ) ) ;
97
- } )
98
+ } ) ;
98
99
99
100
it ( 'should throw when interval less or equal to 0' , ( ) => {
100
101
const exporter = new TestDeltaMetricExporter ( ) ;
101
102
assert . throws ( ( ) => new PeriodicExportingMetricReader ( {
102
103
exporter : exporter ,
103
104
exportIntervalMillis : 0 ,
104
105
exportTimeoutMillis : 0
105
- } ) , new Error ( ' exportIntervalMillis must be greater than 0' ) ) ;
106
- } )
106
+ } ) , / e x p o r t I n t e r v a l M i l l i s m u s t b e g r e a t e r t h a n 0 / ) ;
107
+ } ) ;
107
108
108
109
it ( 'should throw when timeout less or equal to 0' , ( ) => {
109
110
const exporter = new TestDeltaMetricExporter ( ) ;
110
111
assert . throws ( ( ) => new PeriodicExportingMetricReader ( {
111
112
exporter : exporter ,
112
113
exportIntervalMillis : 1 ,
113
114
exportTimeoutMillis : 0
114
- } ) , new Error ( ' exportTimeoutMillis must be greater than 0' ) ) ;
115
- } )
115
+ } ) , / e x p o r t T i m e o u t M i l l i s m u s t b e g r e a t e r t h a n 0 / ) ;
116
+ } ) ;
116
117
117
118
it ( 'should throw when timeout less or equal to interval' , ( ) => {
118
119
const exporter = new TestDeltaMetricExporter ( ) ;
119
120
assert . throws ( ( ) => new PeriodicExportingMetricReader ( {
120
121
exporter : exporter ,
121
122
exportIntervalMillis : 100 ,
122
123
exportTimeoutMillis : 200
123
- } ) , new Error ( ' exportIntervalMillis must be greater than or equal to exportTimeoutMillis' ) ) ;
124
- } )
124
+ } ) , / e x p o r t I n t e r v a l M i l l i s m u s t b e g r e a t e r t h a n o r e q u a l t o e x p o r t T i m e o u t M i l l i s / ) ;
125
+ } ) ;
125
126
126
127
it ( 'should not start exporting' , async ( ) => {
127
128
const exporter = new TestDeltaMetricExporter ( ) ;
@@ -136,7 +137,7 @@ describe('PeriodicExportingMetricReader', () => {
136
137
await new Promise ( resolve => setTimeout ( resolve , 50 ) ) ;
137
138
138
139
exporterMock . verify ( ) ;
139
- } )
140
+ } ) ;
140
141
} ) ;
141
142
142
143
describe ( 'setMetricProducer' , ( ) => {
@@ -151,7 +152,7 @@ describe('PeriodicExportingMetricReader', () => {
151
152
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
152
153
const result = await exporter . waitForNumberOfExports ( 2 ) ;
153
154
154
- assert . deepEqual ( result , [ [ ] , [ ] ] ) ;
155
+ assert . deepStrictEqual ( result , [ [ ] , [ ] ] ) ;
155
156
await reader . shutdown ( ) ;
156
157
} ) ;
157
158
} ) ;
@@ -169,7 +170,7 @@ describe('PeriodicExportingMetricReader', () => {
169
170
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
170
171
171
172
const result = await exporter . waitForNumberOfExports ( 2 ) ;
172
- assert . deepEqual ( result , [ [ ] , [ ] ] ) ;
173
+ assert . deepStrictEqual ( result , [ [ ] , [ ] ] ) ;
173
174
174
175
exporter . throwException = false ;
175
176
await reader . shutdown ( ) ;
@@ -188,7 +189,7 @@ describe('PeriodicExportingMetricReader', () => {
188
189
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
189
190
190
191
const result = await exporter . waitForNumberOfExports ( 2 ) ;
191
- assert . deepEqual ( result , [ [ ] , [ ] ] ) ;
192
+ assert . deepStrictEqual ( result , [ [ ] , [ ] ] ) ;
192
193
193
194
exporter . throwException = false ;
194
195
await reader . shutdown ( ) ;
@@ -227,7 +228,7 @@ describe('PeriodicExportingMetricReader', () => {
227
228
} ) ;
228
229
229
230
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
230
- await assert . rejects ( ( ) => reader . forceFlush ( { timeoutMillis : 20 } ) ,
231
+ await assertRejects ( ( ) => reader . forceFlush ( { timeoutMillis : 20 } ) ,
231
232
TimeoutError ) ;
232
233
await reader . shutdown ( ) ;
233
234
} ) ;
@@ -241,7 +242,7 @@ describe('PeriodicExportingMetricReader', () => {
241
242
exportTimeoutMillis : 80 ,
242
243
} ) ;
243
244
244
- await assert . rejects ( ( ) => reader . forceFlush ( ) ) ;
245
+ await assertRejects ( ( ) => reader . forceFlush ( ) , / E r r o r d u r i n g f o r c e F l u s h / ) ;
245
246
} ) ;
246
247
247
248
it ( 'should not forceFlush exporter after shutdown' , async ( ) => {
@@ -294,7 +295,7 @@ describe('PeriodicExportingMetricReader', () => {
294
295
} ) ;
295
296
296
297
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
297
- await assert . rejects ( ( ) => reader . shutdown ( { timeoutMillis : 20 } ) ,
298
+ await assertRejects ( ( ) => reader . shutdown ( { timeoutMillis : 20 } ) ,
298
299
TimeoutError ) ;
299
300
} ) ;
300
301
@@ -326,7 +327,7 @@ describe('PeriodicExportingMetricReader', () => {
326
327
exportTimeoutMillis : 80 ,
327
328
} ) ;
328
329
329
- await assert . rejects ( ( ) => reader . shutdown ( ) ) ;
330
+ await assertRejects ( ( ) => reader . shutdown ( ) , / E r r o r d u r i n g f o r c e F l u s h / ) ;
330
331
} ) ;
331
332
} )
332
333
;
@@ -340,7 +341,7 @@ describe('PeriodicExportingMetricReader', () => {
340
341
exportTimeoutMillis : 80 ,
341
342
} ) ;
342
343
343
- await assert . rejects ( ( ) => reader . collect ( ) ) ;
344
+ await assertRejects ( ( ) => reader . collect ( ) , / M e t r i c R e a d e r i s n o t b o u n d t o a M e t r i c P r o d u c e r / ) ;
344
345
} ) ;
345
346
346
347
it ( 'should return empty on shut-down instance' , async ( ) => {
@@ -354,7 +355,7 @@ describe('PeriodicExportingMetricReader', () => {
354
355
reader . setMetricProducer ( new TestMetricProducer ( ) ) ;
355
356
356
357
await reader . shutdown ( ) ;
357
- assert . deepEqual ( [ ] , await reader . collect ( ) ) ;
358
+ assert . deepStrictEqual ( [ ] , await reader . collect ( ) ) ;
358
359
} ) ;
359
360
360
361
it ( 'should time out when timeoutMillis is set' , async ( ) => {
@@ -368,7 +369,7 @@ describe('PeriodicExportingMetricReader', () => {
368
369
producer . collectionTime = 40 ;
369
370
reader . setMetricProducer ( producer ) ;
370
371
371
- await assert . rejects (
372
+ await assertRejects (
372
373
( ) => reader . collect ( { timeoutMillis : 20 } ) ,
373
374
TimeoutError
374
375
) ;
0 commit comments