Skip to content

Commit 48be2c3

Browse files
allen-k1mallen-k1m
committed
Merge remote-tracking branch 'origin/feature/asyncio-instrumentation' into feature/asyncio-instrumentation
2 parents e84ee7c + 8512d8e commit 48be2c3

File tree

5 files changed

+183
-15
lines changed

5 files changed

+183
-15
lines changed

‎.github/workflows/instrumentations_0.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
9+
CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
1010

1111
jobs:
1212
instrumentations-0:

‎.github/workflows/instrumentations_1.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
9+
CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
1010

1111
jobs:
1212
instrumentations-1:

‎.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- 'release/*'
77
pull_request:
88
env:
9-
CORE_REPO_SHA: 84c0e4f38d4fcdb8c13fd3988469fbb8cda28150
9+
CORE_REPO_SHA: e98af82ff0ebe7e687fda265093aa576cd9ba80f
1010

1111
jobs:
1212
misc:

‎instrumentation/opentelemetry-instrumentation-celery/tests/test_metrics.py

+39-3
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,44 @@ def test_basic_metric(self):
6464

6565
def test_metric_uninstrument(self):
6666
CeleryInstrumentor().instrument()
67-
metrics = self.get_metrics()
68-
self.assertEqual(len(metrics), 1)
67+
68+
self.get_metrics()
69+
self.assertEqual(
70+
(
71+
self.memory_metrics_reader.get_metrics_data()
72+
.resource_metrics[0]
73+
.scope_metrics[0]
74+
.metrics[0]
75+
.data.data_points[0]
76+
.bucket_counts[1]
77+
),
78+
1,
79+
)
80+
81+
self.get_metrics()
82+
self.assertEqual(
83+
(
84+
self.memory_metrics_reader.get_metrics_data()
85+
.resource_metrics[0]
86+
.scope_metrics[0]
87+
.metrics[0]
88+
.data.data_points[0]
89+
.bucket_counts[1]
90+
),
91+
2,
92+
)
93+
6994
CeleryInstrumentor().uninstrument()
7095

71-
self.assertIsNone(self.memory_metrics_reader.get_metrics_data())
96+
self.get_metrics()
97+
self.assertEqual(
98+
(
99+
self.memory_metrics_reader.get_metrics_data()
100+
.resource_metrics[0]
101+
.scope_metrics[0]
102+
.metrics[0]
103+
.data.data_points[0]
104+
.bucket_counts[1]
105+
),
106+
2,
107+
)

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

+141-9
Original file line numberDiff line numberDiff line change
@@ -194,15 +194,147 @@ def test_basic_metric_request_not_empty(self):
194194
)
195195
def test_metric_uninstrument(self):
196196
with request.urlopen(self.URL):
197-
metrics = self.get_sorted_metrics()
198-
self.assertEqual(len(metrics), 3)
199197

200-
self.assertEqual(metrics[0].data.data_points[0].sum, 1)
201-
self.assertEqual(metrics[1].data.data_points[0].sum, 0)
202-
self.assertEqual(metrics[2].data.data_points[0].sum, 6)
198+
self.assertEqual(
199+
len(
200+
(
201+
self.memory_metrics_reader.get_metrics_data()
202+
.resource_metrics[0]
203+
.scope_metrics[0]
204+
.metrics
205+
)
206+
),
207+
3,
208+
)
209+
210+
self.assertEqual(
211+
(
212+
self.memory_metrics_reader.get_metrics_data()
213+
.resource_metrics[0]
214+
.scope_metrics[0]
215+
.metrics[0]
216+
.data.data_points[0]
217+
.bucket_counts[1]
218+
),
219+
1,
220+
)
221+
self.assertEqual(
222+
(
223+
self.memory_metrics_reader.get_metrics_data()
224+
.resource_metrics[0]
225+
.scope_metrics[0]
226+
.metrics[1]
227+
.data.data_points[0]
228+
.bucket_counts[0]
229+
),
230+
1,
231+
)
232+
self.assertEqual(
233+
(
234+
self.memory_metrics_reader.get_metrics_data()
235+
.resource_metrics[0]
236+
.scope_metrics[0]
237+
.metrics[2]
238+
.data.data_points[0]
239+
.bucket_counts[2]
240+
),
241+
1,
242+
)
243+
244+
with request.urlopen(self.URL):
245+
246+
self.assertEqual(
247+
len(
248+
(
249+
self.memory_metrics_reader.get_metrics_data()
250+
.resource_metrics[0]
251+
.scope_metrics[0]
252+
.metrics
253+
)
254+
),
255+
3,
256+
)
257+
258+
self.assertEqual(
259+
(
260+
self.memory_metrics_reader.get_metrics_data()
261+
.resource_metrics[0]
262+
.scope_metrics[0]
263+
.metrics[0]
264+
.data.data_points[0]
265+
.bucket_counts[1]
266+
),
267+
2,
268+
)
269+
self.assertEqual(
270+
(
271+
self.memory_metrics_reader.get_metrics_data()
272+
.resource_metrics[0]
273+
.scope_metrics[0]
274+
.metrics[1]
275+
.data.data_points[0]
276+
.bucket_counts[0]
277+
),
278+
2,
279+
)
280+
self.assertEqual(
281+
(
282+
self.memory_metrics_reader.get_metrics_data()
283+
.resource_metrics[0]
284+
.scope_metrics[0]
285+
.metrics[2]
286+
.data.data_points[0]
287+
.bucket_counts[2]
288+
),
289+
2,
290+
)
291+
292+
URLLibInstrumentor().uninstrument()
293+
294+
with request.urlopen(self.URL):
295+
296+
self.assertEqual(
297+
len(
298+
(
299+
self.memory_metrics_reader.get_metrics_data()
300+
.resource_metrics[0]
301+
.scope_metrics[0]
302+
.metrics
303+
)
304+
),
305+
3,
306+
)
203307

204-
URLLibInstrumentor().uninstrument()
205-
with request.urlopen(self.URL):
206-
self.assertIsNone(
308+
self.assertEqual(
309+
(
310+
self.memory_metrics_reader.get_metrics_data()
311+
.resource_metrics[0]
312+
.scope_metrics[0]
313+
.metrics[0]
314+
.data.data_points[0]
315+
.bucket_counts[1]
316+
),
317+
2,
318+
)
319+
self.assertEqual(
320+
(
207321
self.memory_metrics_reader.get_metrics_data()
208-
)
322+
.resource_metrics[0]
323+
.scope_metrics[0]
324+
.metrics[1]
325+
.data.data_points[0]
326+
.bucket_counts[0]
327+
),
328+
2,
329+
)
330+
self.assertEqual(
331+
(
332+
self.memory_metrics_reader.get_metrics_data()
333+
.resource_metrics[0]
334+
.scope_metrics[0]
335+
.metrics[2]
336+
.data.data_points[0]
337+
.bucket_counts[2]
338+
),
339+
2,
340+
)

0 commit comments

Comments
 (0)