opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-07-31 22:23:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix celery and urllib tests (#2170)

Browse Source 
* Update core SHA

Fixes #2173

* Fix celery and urllib tests

Fixes #2164
This commit is contained in:
Diego Hurtado
2024-02-12 17:54:32 -06:00
committed by GitHub
parent 8fd2105cea
commit d167ef7b43
5 changed files with 183 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/instrumentations_0.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150 CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
jobs: jobs:
instrumentations-0: instrumentations-0:

2
.github/workflows/instrumentations_1.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150 CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
jobs: jobs:
instrumentations-1: instrumentations-1:

2
.github/workflows/test.yml vendored
View File

@ -6,7 +6,7 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: d829e375202d0106d45d7a2441409be82086b423 CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
jobs: jobs:
misc: misc:

42
instrumentation/opentelemetry-instrumentation-celery/tests/test_metrics.py
View File

@ -64,8 +64,44 @@ class TestMetrics(TestBase):
def test_metric_uninstrument(self): def test_metric_uninstrument(self):
CeleryInstrumentor().instrument() CeleryInstrumentor().instrument()
metrics = self.get_metrics()
self.assertEqual(len(metrics), 1) self.get_metrics()
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
1,
)
self.get_metrics()
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
2,
)
CeleryInstrumentor().uninstrument() CeleryInstrumentor().uninstrument()
self.assertIsNone(self.memory_metrics_reader.get_metrics_data()) self.get_metrics()
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
2,
)

144
instrumentation/opentelemetry-instrumentation-urllib/tests/test_metrics_instrumentation.py
View File

@ -194,15 +194,147 @@ class TestUrllibMetricsInstrumentation(TestBase):
) )
def test_metric_uninstrument(self): def test_metric_uninstrument(self):
with request.urlopen(self.URL): with request.urlopen(self.URL):
metrics = self.get_sorted_metrics()
self.assertEqual(len(metrics), 3)
self.assertEqual(metrics[0].data.data_points[0].sum, 1) self.assertEqual(
self.assertEqual(metrics[1].data.data_points[0].sum, 0) len(
self.assertEqual(metrics[2].data.data_points[0].sum, 6) (
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics
)
),
3,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
1,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[1]
.data.data_points[0]
.bucket_counts[0]
),
1,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[2]
.data.data_points[0]
.bucket_counts[2]
),
1,
)
with request.urlopen(self.URL):
self.assertEqual(
len(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics
)
),
3,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
2,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[1]
.data.data_points[0]
.bucket_counts[0]
),
2,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[2]
.data.data_points[0]
.bucket_counts[2]
),
2,
)
URLLibInstrumentor().uninstrument() URLLibInstrumentor().uninstrument()
with request.urlopen(self.URL): with request.urlopen(self.URL):
self.assertIsNone(
self.assertEqual(
len(
(
self.memory_metrics_reader.get_metrics_data() self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics
)
),
3,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[0]
.data.data_points[0]
.bucket_counts[1]
),
2,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[1]
.data.data_points[0]
.bucket_counts[0]
),
2,
)
self.assertEqual(
(
self.memory_metrics_reader.get_metrics_data()
.resource_metrics[0]
.scope_metrics[0]
.metrics[2]
.data.data_points[0]
.bucket_counts[2]
),
2,
) )