opensource/opentelemetry-python-contrib
1
0
Fork 0
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git synced 2025-08-01 17:34:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update instrumentations (#232)

Browse Source
This commit is contained in:
Srikanth Chekuri
2020-12-07 16:29:57 +00:00
committed by GitHub
parent a403b65183
commit 744e961080
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,8 @@ on:
- 'release/*' - 'release/*'
pull_request: pull_request:
env: env:
CORE_REPO_SHA: ce6449accf315977dd1eab940f7f49b7d894618f CORE_REPO_SHA: f69e12fba8d0afd587dd21adbedfe751153aa73c
jobs: jobs:
build: build:

8
instrumentation/opentelemetry-instrumentation-django/tests/test_middleware.py
View File

@ -144,8 +144,8 @@ class TestMiddleware(TestBase, WsgiTestBase):
self.assertEqual(span.attributes["http.status_text"], "OK") self.assertEqual(span.attributes["http.status_text"], "OK")
self.assertIsNotNone(_django_instrumentor.meter) self.assertIsNotNone(_django_instrumentor.meter)
self.assertEqual(len(_django_instrumentor.meter.metrics), 1) self.assertEqual(len(_django_instrumentor.meter.instruments), 1)
recorder = _django_instrumentor.meter.metrics.pop() recorder = list(_django_instrumentor.meter.instruments.values())[0]
match_key = get_dict_as_key( match_key = get_dict_as_key(
{ {
"http.flavor": "1.1", "http.flavor": "1.1",
@ -222,7 +222,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
self.assertEqual(span.attributes["http.scheme"], "http") self.assertEqual(span.attributes["http.scheme"], "http")
self.assertEqual(span.attributes["http.status_code"], 500) self.assertEqual(span.attributes["http.status_code"], 500)
self.assertIsNotNone(_django_instrumentor.meter) self.assertIsNotNone(_django_instrumentor.meter)
self.assertEqual(len(_django_instrumentor.meter.metrics), 1) self.assertEqual(len(_django_instrumentor.meter.instruments), 1)
self.assertEqual(len(span.events), 1) self.assertEqual(len(span.events), 1)
event = span.events[0] event = span.events[0]
@ -230,7 +230,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
self.assertEqual(event.attributes["exception.type"], "ValueError") self.assertEqual(event.attributes["exception.type"], "ValueError")
self.assertEqual(event.attributes["exception.message"], "error") self.assertEqual(event.attributes["exception.message"], "error")
recorder = _django_instrumentor.meter.metrics.pop() recorder = list(_django_instrumentor.meter.instruments.values())[0]
match_key = get_dict_as_key( match_key = get_dict_as_key(
{ {
"http.flavor": "1.1", "http.flavor": "1.1",

12
instrumentation/opentelemetry-instrumentation-requests/tests/test_requests_integration.py
View File

@ -88,8 +88,8 @@ class RequestsIntegrationTestBase(abc.ABC):
) )
self.assertIsNotNone(RequestsInstrumentor().meter) self.assertIsNotNone(RequestsInstrumentor().meter)
self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1)
recorder = RequestsInstrumentor().meter.metrics.pop() recorder = list(RequestsInstrumentor().meter.instruments.values())[0]
match_key = get_dict_as_key( match_key = get_dict_as_key(
{ {
"http.flavor": "1.1", "http.flavor": "1.1",
@ -287,8 +287,8 @@ class RequestsIntegrationTestBase(abc.ABC):
self.assertEqual(span.status.status_code, StatusCode.ERROR) self.assertEqual(span.status.status_code, StatusCode.ERROR)
self.assertIsNotNone(RequestsInstrumentor().meter) self.assertIsNotNone(RequestsInstrumentor().meter)
self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1)
recorder = RequestsInstrumentor().meter.metrics.pop() recorder = list(RequestsInstrumentor().meter.instruments.values())[0]
match_key = get_dict_as_key( match_key = get_dict_as_key(
{ {
"http.method": "GET", "http.method": "GET",
@ -328,8 +328,8 @@ class RequestsIntegrationTestBase(abc.ABC):
) )
self.assertEqual(span.status.status_code, StatusCode.ERROR) self.assertEqual(span.status.status_code, StatusCode.ERROR)
self.assertIsNotNone(RequestsInstrumentor().meter) self.assertIsNotNone(RequestsInstrumentor().meter)
self.assertEqual(len(RequestsInstrumentor().meter.metrics), 1) self.assertEqual(len(RequestsInstrumentor().meter.instruments), 1)
recorder = RequestsInstrumentor().meter.metrics.pop() recorder = list(RequestsInstrumentor().meter.instruments.values())[0]
match_key = get_dict_as_key( match_key = get_dict_as_key(
{ {
"http.method": "GET", "http.method": "GET",

4
instrumentation/opentelemetry-instrumentation-system-metrics/tests/test_system_metrics.py
View File

@ -37,7 +37,7 @@ class TestSystemMetrics(TestBase):
mock_get_meter.return_value = meter mock_get_meter.return_value = meter
SystemMetrics(self.memory_metrics_exporter) SystemMetrics(self.memory_metrics_exporter)
self.assertEqual(len(meter.observers), 18) self.assertEqual(len(meter.instruments), 18)
observer_names = [ observer_names = [
"system.cpu.time", "system.cpu.time",
@ -60,7 +60,7 @@ class TestSystemMetrics(TestBase):
"runtime.{}.gc_count".format(self.implementation), "runtime.{}.gc_count".format(self.implementation),
] ]
for observer in meter.observers: for observer in meter.instruments.values():
self.assertIn(observer.name, observer_names) self.assertIn(observer.name, observer_names)
observer_names.remove(observer.name) observer_names.remove(observer.name)