open-telemetry
/
opentelemetry-python-contrib
mirror of https://github.com/open-telemetry/opentelemetry-python-contrib.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change status codes from grpc status codes, remove setting status in instrumentations except on ERROR (#1282)

This commit is contained in:
Leighton Chen 2020-10-28 17:28:58 -04:00 committed by GitHub
parent 0586264ec6
commit fd5ffe84b9
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py
View File

@ -8,7 +8,7 @@ from opentelemetry.instrumentation.dbapi import (
TracedCursor, TracedCursor,
) )
from opentelemetry.trace import SpanKind from opentelemetry.trace import SpanKind
from opentelemetry.trace.status import Status, StatusCanonicalCode from opentelemetry.trace.status import Status, StatusCode
# pylint: disable=abstract-method # pylint: disable=abstract-method
@ -108,14 +108,10 @@ class AsyncTracedCursor(TracedCursor):
self._populate_span(span, *args) self._populate_span(span, *args)
try: try:
result = await query_method(*args, **kwargs) result = await query_method(*args, **kwargs)
if span.is_recording():
span.set_status(Status(StatusCanonicalCode.OK))
return result return result
except Exception as ex: # pylint: disable=broad-except except Exception as ex: # pylint: disable=broad-except
if span.is_recording(): if span.is_recording():
span.set_status( span.set_status(Status(StatusCode.ERROR, str(ex)))
Status(StatusCanonicalCode.UNKNOWN, str(ex))
)
raise ex raise ex

6
instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py
View File

@ -226,8 +226,7 @@ class TestAiopgIntegration(TestBase):
self.assertEqual(span.attributes["net.peer.name"], "testhost") self.assertEqual(span.attributes["net.peer.name"], "testhost")
self.assertEqual(span.attributes["net.peer.port"], 123) self.assertEqual(span.attributes["net.peer.port"], 123)
self.assertIs( self.assertIs(
span.status.canonical_code, span.status.status_code, trace_api.status.StatusCode.UNSET,
trace_api.status.StatusCanonicalCode.OK,
) )
def test_span_not_recording(self): def test_span_not_recording(self):
@ -278,8 +277,7 @@ class TestAiopgIntegration(TestBase):
span = spans_list[0] span = spans_list[0]
self.assertEqual(span.attributes["db.statement"], "Test query") self.assertEqual(span.attributes["db.statement"], "Test query")
self.assertIs( self.assertIs(
span.status.canonical_code, span.status.status_code, trace_api.status.StatusCode.ERROR,
trace_api.status.StatusCanonicalCode.UNKNOWN,
) )
self.assertEqual(span.status.description, "Test Exception") self.assertEqual(span.status.description, "Test Exception")