Change status codes from grpc status codes, remove setting status in instrumentations except on ERROR (#1282)
This commit is contained in:
parent
fa77bb85a7
commit
b5b81db05f
|
|
@ -27,7 +27,7 @@ from opentelemetry.sdk.util import get_dict_as_key
|
||||||
from opentelemetry.test.test_base import TestBase
|
from opentelemetry.test.test_base import TestBase
|
||||||
from opentelemetry.test.wsgitestutil import WsgiTestBase
|
from opentelemetry.test.wsgitestutil import WsgiTestBase
|
||||||
from opentelemetry.trace import SpanKind
|
from opentelemetry.trace import SpanKind
|
||||||
from opentelemetry.trace.status import StatusCanonicalCode
|
from opentelemetry.trace.status import StatusCode
|
||||||
from opentelemetry.util import ExcludeList
|
from opentelemetry.util import ExcludeList
|
||||||
|
|
||||||
# pylint: disable=import-error
|
# pylint: disable=import-error
|
||||||
|
|
@ -87,7 +87,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
|
||||||
else "tests.views.traced",
|
else "tests.views.traced",
|
||||||
)
|
)
|
||||||
self.assertEqual(span.kind, SpanKind.SERVER)
|
self.assertEqual(span.kind, SpanKind.SERVER)
|
||||||
self.assertEqual(span.status.canonical_code, StatusCanonicalCode.OK)
|
self.assertEqual(span.status.status_code, StatusCode.UNSET)
|
||||||
self.assertEqual(span.attributes["http.method"], "GET")
|
self.assertEqual(span.attributes["http.method"], "GET")
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
span.attributes["http.url"],
|
span.attributes["http.url"],
|
||||||
|
|
@ -113,7 +113,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
|
||||||
span.name, "^traced/" if DJANGO_2_2 else "tests.views.traced"
|
span.name, "^traced/" if DJANGO_2_2 else "tests.views.traced"
|
||||||
)
|
)
|
||||||
self.assertEqual(span.kind, SpanKind.SERVER)
|
self.assertEqual(span.kind, SpanKind.SERVER)
|
||||||
self.assertEqual(span.status.canonical_code, StatusCanonicalCode.OK)
|
self.assertEqual(span.status.status_code, StatusCode.UNSET)
|
||||||
self.assertEqual(span.attributes["http.method"], "GET")
|
self.assertEqual(span.attributes["http.method"], "GET")
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
span.attributes["http.url"], "http://testserver/traced/"
|
span.attributes["http.url"], "http://testserver/traced/"
|
||||||
|
|
@ -170,7 +170,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
|
||||||
span.name, "^traced/" if DJANGO_2_2 else "tests.views.traced"
|
span.name, "^traced/" if DJANGO_2_2 else "tests.views.traced"
|
||||||
)
|
)
|
||||||
self.assertEqual(span.kind, SpanKind.SERVER)
|
self.assertEqual(span.kind, SpanKind.SERVER)
|
||||||
self.assertEqual(span.status.canonical_code, StatusCanonicalCode.OK)
|
self.assertEqual(span.status.status_code, StatusCode.UNSET)
|
||||||
self.assertEqual(span.attributes["http.method"], "POST")
|
self.assertEqual(span.attributes["http.method"], "POST")
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
span.attributes["http.url"], "http://testserver/traced/"
|
span.attributes["http.url"], "http://testserver/traced/"
|
||||||
|
|
@ -193,9 +193,7 @@ class TestMiddleware(TestBase, WsgiTestBase):
|
||||||
span.name, "^error/" if DJANGO_2_2 else "tests.views.error"
|
span.name, "^error/" if DJANGO_2_2 else "tests.views.error"
|
||||||
)
|
)
|
||||||
self.assertEqual(span.kind, SpanKind.SERVER)
|
self.assertEqual(span.kind, SpanKind.SERVER)
|
||||||
self.assertEqual(
|
self.assertEqual(span.status.status_code, StatusCode.ERROR)
|
||||||
span.status.canonical_code, StatusCanonicalCode.INTERNAL
|
|
||||||
)
|
|
||||||
self.assertEqual(span.attributes["http.method"], "GET")
|
self.assertEqual(span.attributes["http.method"], "GET")
|
||||||
self.assertEqual(
|
self.assertEqual(
|
||||||
span.attributes["http.url"], "http://testserver/error/"
|
span.attributes["http.url"], "http://testserver/error/"
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue