diff --git a/tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py b/tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py index cb9080e62..2e37efe22 100644 --- a/tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py +++ b/tests/opentelemetry-docker-tests/tests/asyncpg/test_asyncpg_functional.py @@ -5,7 +5,7 @@ import asyncpg from opentelemetry.instrumentation.asyncpg import AsyncPGInstrumentor from opentelemetry.test.test_base import TestBase -from opentelemetry.trace.status import StatusCanonicalCode +from opentelemetry.trace.status import StatusCode POSTGRES_HOST = os.getenv("POSTGRESQL_HOST ", "localhost") POSTGRES_PORT = int(os.getenv("POSTGRESQL_PORT ", "5432")) @@ -45,9 +45,7 @@ class TestFunctionalAsyncPG(TestBase): async_call(self._connection.execute("SELECT 42;")) spans = self.memory_exporter.get_finished_spans() self.assertEqual(len(spans), 1) - self.assertEqual( - StatusCanonicalCode.OK, spans[0].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[0].status.status_code) self.assertEqual( spans[0].attributes, { @@ -90,9 +88,7 @@ class TestFunctionalAsyncPG(TestBase): }, spans[0].attributes, ) - self.assertEqual( - StatusCanonicalCode.OK, spans[0].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[0].status.status_code) self.assertEqual( { "db.instance": POSTGRES_DB_NAME, @@ -102,9 +98,7 @@ class TestFunctionalAsyncPG(TestBase): }, spans[1].attributes, ) - self.assertEqual( - StatusCanonicalCode.OK, spans[1].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[1].status.status_code) self.assertEqual( { "db.instance": POSTGRES_DB_NAME, @@ -114,9 +108,7 @@ class TestFunctionalAsyncPG(TestBase): }, spans[2].attributes, ) - self.assertEqual( - StatusCanonicalCode.OK, spans[2].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[2].status.status_code) def test_instrumented_failed_transaction_method(self, *_, **__): async def _transaction_execute(): @@ -137,9 +129,7 @@ class TestFunctionalAsyncPG(TestBase): }, spans[0].attributes, ) - self.assertEqual( - StatusCanonicalCode.OK, spans[0].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[0].status.status_code) self.assertEqual( { "db.instance": POSTGRES_DB_NAME, @@ -150,8 +140,7 @@ class TestFunctionalAsyncPG(TestBase): spans[1].attributes, ) self.assertEqual( - StatusCanonicalCode.INVALID_ARGUMENT, - spans[1].status.canonical_code, + StatusCode.ERROR, spans[1].status.status_code, ) self.assertEqual( { @@ -162,17 +151,13 @@ class TestFunctionalAsyncPG(TestBase): }, spans[2].attributes, ) - self.assertEqual( - StatusCanonicalCode.OK, spans[2].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[2].status.status_code) def test_instrumented_method_doesnt_capture_parameters(self, *_, **__): async_call(self._connection.execute("SELECT $1;", "1")) spans = self.memory_exporter.get_finished_spans() self.assertEqual(len(spans), 1) - self.assertEqual( - StatusCanonicalCode.OK, spans[0].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[0].status.status_code) self.assertEqual( spans[0].attributes, { @@ -216,9 +201,7 @@ class TestFunctionalAsyncPG_CaptureParameters(TestBase): async_call(self._connection.execute("SELECT $1;", "1")) spans = self.memory_exporter.get_finished_spans() self.assertEqual(len(spans), 1) - self.assertEqual( - StatusCanonicalCode.OK, spans[0].status.canonical_code - ) + self.assertIs(StatusCode.UNSET, spans[0].status.status_code) self.assertEqual( spans[0].attributes, { diff --git a/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py index c4be6762e..7786890a5 100644 --- a/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py +++ b/tests/opentelemetry-docker-tests/tests/celery/test_celery_functional.py @@ -22,7 +22,7 @@ from opentelemetry import trace as trace_api from opentelemetry.instrumentation.celery import CeleryInstrumentor from opentelemetry.sdk import resources from opentelemetry.sdk.trace import TracerProvider, export -from opentelemetry.trace.status import StatusCanonicalCode +from opentelemetry.trace.status import StatusCode # set a high timeout for async executions due to issues in CI ASYNC_GET_TIMEOUT = 120 @@ -257,7 +257,7 @@ def test_fn_exception(celery_app, memory_exporter): span.attributes.get("celery.task_name") == "test_celery_functional.fn_exception" ) - assert span.status.canonical_code == StatusCanonicalCode.UNKNOWN + assert span.status.status_code == StatusCode.ERROR assert span.attributes.get("messaging.message_id") == result.task_id assert "Task class is failing" in span.status.description @@ -278,7 +278,7 @@ def test_fn_exception_expected(celery_app, memory_exporter): span = spans[0] assert span.status.is_ok is True - assert span.status.canonical_code == StatusCanonicalCode.OK + assert span.status.status_code == StatusCode.UNSET assert span.name == "run/test_celery_functional.fn_exception" assert span.attributes.get("celery.action") == "run" assert span.attributes.get("celery.state") == "FAILURE" @@ -305,7 +305,7 @@ def test_fn_retry_exception(celery_app, memory_exporter): span = spans[0] assert span.status.is_ok is True - assert span.status.canonical_code == StatusCanonicalCode.OK + assert span.status.status_code == StatusCode.UNSET assert span.name == "run/test_celery_functional.fn_exception" assert span.attributes.get("celery.action") == "run" assert span.attributes.get("celery.state") == "RETRY" @@ -377,7 +377,7 @@ def test_class_task_exception(celery_app, memory_exporter): ) assert span.attributes.get("celery.action") == "run" assert span.attributes.get("celery.state") == "FAILURE" - assert span.status.canonical_code == StatusCanonicalCode.UNKNOWN + assert span.status.status_code == StatusCode.ERROR assert span.attributes.get("messaging.message_id") == result.task_id assert "Task class is failing" in span.status.description @@ -406,7 +406,7 @@ def test_class_task_exception_excepted(celery_app, memory_exporter): span = spans[0] assert span.status.is_ok is True - assert span.status.canonical_code == StatusCanonicalCode.OK + assert span.status.status_code == StatusCode.UNSET assert span.name == "run/test_celery_functional.BaseTask" assert span.attributes.get("celery.action") == "run" assert span.attributes.get("celery.state") == "FAILURE" diff --git a/tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py b/tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py index 64984e9c4..8bdc12010 100644 --- a/tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py +++ b/tests/opentelemetry-docker-tests/tests/redis/test_redis_functional.py @@ -36,9 +36,7 @@ class TestRedisInstrument(TestBase): def _check_span(self, span): self.assertEqual(span.attributes["service"], self.test_service) self.assertEqual(span.name, "redis.command") - self.assertIs( - span.status.canonical_code, trace.status.StatusCanonicalCode.OK - ) + self.assertIs(span.status.status_code, trace.status.StatusCode.UNSET) self.assertEqual(span.attributes.get("db.instance"), 0) self.assertEqual( span.attributes.get("db.url"), "redis://localhost:6379" diff --git a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py index b2d8c0abc..72137f83e 100644 --- a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py +++ b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/mixins.py @@ -113,9 +113,7 @@ class SQLAlchemyTestMixin(TestBase): self.assertEqual(span.name, "{}.query".format(self.VENDOR)) self.assertEqual(span.attributes.get("service"), self.SERVICE) self.assertEqual(span.attributes.get(_DB), self.SQL_DB) - self.assertIs( - span.status.canonical_code, trace.status.StatusCanonicalCode.OK - ) + self.assertIs(span.status.status_code, trace.status.StatusCode.UNSET) self.assertGreater((span.end_time - span.start_time), 0) def test_orm_insert(self): diff --git a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py index 20c837c03..c408c63d9 100644 --- a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py +++ b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_instrument.py @@ -66,7 +66,5 @@ class SQLAlchemyInstrumentTestCase(TestBase): # check subset of span fields self.assertEqual(span.name, "postgres.query") self.assertEqual(span.attributes.get("service"), "postgres") - self.assertIs( - span.status.canonical_code, trace.status.StatusCanonicalCode.OK - ) + self.assertIs(span.status.status_code, trace.status.StatusCode.UNSET) self.assertGreater((span.end_time - span.start_time), 0) diff --git a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py index 44c3501b1..310cd91f7 100644 --- a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py +++ b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_mysql.py @@ -77,7 +77,6 @@ class MysqlConnectorTestCase(SQLAlchemyTestMixin): self.assertTrue(span.end_time - span.start_time > 0) # check the error self.assertIs( - span.status.canonical_code, - trace.status.StatusCanonicalCode.UNKNOWN, + span.status.status_code, trace.status.StatusCode.ERROR, ) self.assertIn("a_wrong_table", span.status.description) diff --git a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py index 615a196f5..91fb123c9 100644 --- a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py +++ b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_postgres.py @@ -78,8 +78,7 @@ class PostgresTestCase(SQLAlchemyTestMixin): self.assertTrue(span.end_time - span.start_time > 0) # check the error self.assertIs( - span.status.canonical_code, - trace.status.StatusCanonicalCode.UNKNOWN, + span.status.status_code, trace.status.StatusCode.ERROR, ) self.assertIn("a_wrong_table", span.status.description) diff --git a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py index 4295fc045..309dd73cc 100644 --- a/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py +++ b/tests/opentelemetry-docker-tests/tests/sqlalchemy_tests/test_sqlite.py @@ -53,8 +53,7 @@ class SQLiteTestCase(SQLAlchemyTestMixin): self.assertTrue((span.end_time - span.start_time) > 0) # check the error self.assertIs( - span.status.canonical_code, - trace.status.StatusCanonicalCode.UNKNOWN, + span.status.status_code, trace.status.StatusCode.ERROR, ) self.assertEqual( span.status.description, "no such table: a_wrong_table"