Skip to content

Commit a83c8d9

Browse files
emdnetoemdneto
authored
make urllib test less flaky (open-telemetry#3336)
* make urllib test less flaky Signed-off-by: emdneto <[email protected]> * Update instrumentation/opentelemetry-instrumentation-urllib/tests/test_metrics_instrumentation.py * ruff Signed-off-by: emdneto <[email protected]> --------- Signed-off-by: emdneto <[email protected]>
1 parent a01564c commit a83c8d9

File tree

1 file changed

+39
-105
lines changed

1 file changed

+39
-105
lines changed

‎instrumentation/opentelemetry-instrumentation-urllib/tests/test_metrics_instrumentation.py‎

Lines changed: 39 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -404,144 +404,78 @@ def test_basic_metric_request_not_empty(self):
404404
)
405405
def test_metric_uninstrument(self):
406406
with request.urlopen(self.URL):
407-
self.assertEqual(
408-
len(
409-
(
410-
self.memory_metrics_reader.get_metrics_data()
411-
.resource_metrics[0]
412-
.scope_metrics[0]
413-
.metrics
414-
)
415-
),
416-
3,
417-
)
407+
metrics = self.get_sorted_metrics()
408+
self.assertEqual(len(metrics), 3)
409+
410+
(
411+
client_duration,
412+
client_request_size,
413+
client_response_size,
414+
) = metrics[:3]
418415

419416
self.assertEqual(
420-
(
421-
self.memory_metrics_reader.get_metrics_data()
422-
.resource_metrics[0]
423-
.scope_metrics[0]
424-
.metrics[0]
425-
.data.data_points[0]
426-
.bucket_counts[1]
427-
),
417+
client_duration.data.data_points[0].bucket_counts[1],
428418
1,
429419
)
420+
430421
self.assertEqual(
431-
(
432-
self.memory_metrics_reader.get_metrics_data()
433-
.resource_metrics[0]
434-
.scope_metrics[0]
435-
.metrics[1]
436-
.data.data_points[0]
437-
.bucket_counts[0]
438-
),
422+
client_request_size.data.data_points[0].bucket_counts[0],
439423
1,
440424
)
441425
self.assertEqual(
442-
(
443-
self.memory_metrics_reader.get_metrics_data()
444-
.resource_metrics[0]
445-
.scope_metrics[0]
446-
.metrics[2]
447-
.data.data_points[0]
448-
.bucket_counts[2]
449-
),
426+
client_response_size.data.data_points[0].bucket_counts[2],
450427
1,
451428
)
452429

453430
with request.urlopen(self.URL):
454-
self.assertEqual(
455-
len(
456-
(
457-
self.memory_metrics_reader.get_metrics_data()
458-
.resource_metrics[0]
459-
.scope_metrics[0]
460-
.metrics
461-
)
462-
),
463-
3,
464-
)
431+
metrics = self.get_sorted_metrics()
432+
433+
self.assertEqual(len(metrics), 3)
434+
435+
(
436+
client_duration,
437+
client_request_size,
438+
client_response_size,
439+
) = metrics[:3]
465440

466441
self.assertEqual(
467-
(
468-
self.memory_metrics_reader.get_metrics_data()
469-
.resource_metrics[0]
470-
.scope_metrics[0]
471-
.metrics[0]
472-
.data.data_points[0]
473-
.bucket_counts[1]
474-
),
442+
client_duration.data.data_points[0].bucket_counts[1],
475443
2,
476444
)
477445
self.assertEqual(
478-
(
479-
self.memory_metrics_reader.get_metrics_data()
480-
.resource_metrics[0]
481-
.scope_metrics[0]
482-
.metrics[1]
483-
.data.data_points[0]
484-
.bucket_counts[0]
485-
),
446+
client_request_size.data.data_points[0].bucket_counts[0],
486447
2,
487448
)
488449
self.assertEqual(
489-
(
490-
self.memory_metrics_reader.get_metrics_data()
491-
.resource_metrics[0]
492-
.scope_metrics[0]
493-
.metrics[2]
494-
.data.data_points[0]
495-
.bucket_counts[2]
496-
),
450+
client_response_size.data.data_points[0].bucket_counts[2],
497451
2,
498452
)
499453

500454
URLLibInstrumentor().uninstrument()
501455

502456
with request.urlopen(self.URL):
503-
self.assertEqual(
504-
len(
505-
(
506-
self.memory_metrics_reader.get_metrics_data()
507-
.resource_metrics[0]
508-
.scope_metrics[0]
509-
.metrics
510-
)
511-
),
512-
3,
513-
)
457+
metrics = self.get_sorted_metrics()
458+
459+
self.assertEqual(len(metrics), 3)
460+
461+
(
462+
client_duration,
463+
client_request_size,
464+
client_response_size,
465+
) = metrics[:3]
466+
467+
self.assertEqual(len(metrics), 3)
514468

515469
self.assertEqual(
516-
(
517-
self.memory_metrics_reader.get_metrics_data()
518-
.resource_metrics[0]
519-
.scope_metrics[0]
520-
.metrics[0]
521-
.data.data_points[0]
522-
.bucket_counts[1]
523-
),
470+
client_duration.data.data_points[0].bucket_counts[1],
524471
2,
525472
)
526473
self.assertEqual(
527-
(
528-
self.memory_metrics_reader.get_metrics_data()
529-
.resource_metrics[0]
530-
.scope_metrics[0]
531-
.metrics[1]
532-
.data.data_points[0]
533-
.bucket_counts[0]
534-
),
474+
client_request_size.data.data_points[0].bucket_counts[0],
535475
2,
536476
)
477+
537478
self.assertEqual(
538-
(
539-
self.memory_metrics_reader.get_metrics_data()
540-
.resource_metrics[0]
541-
.scope_metrics[0]
542-
.metrics[2]
543-
.data.data_points[0]
544-
.bucket_counts[2]
545-
),
479+
client_response_size.data.data_points[0].bucket_counts[2],
546480
2,
547481
)

0 commit comments

Comments
 (0)