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

instrumentation/opentelemetry-instrumentation-aiopg/src/opentelemetry/instrumentation/aiopg/aiopg_integration.py

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

instrumentation/opentelemetry-instrumentation-aiopg/tests/test_aiopg_integration.py

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