From d384aa3de65720c2f23229523c71ced185e30000 Mon Sep 17 00:00:00 2001 From: lucknerjb Date: Tue, 14 Nov 2023 23:08:51 -0500 Subject: [PATCH] Update imports to be compatible with the latest version of ddtrace --- ddtrace_graphql/__init__.py | 2 +- ddtrace_graphql/base.py | 8 ++++---- ddtrace_graphql/patch.py | 3 +-- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/ddtrace_graphql/__init__.py b/ddtrace_graphql/__init__.py index b081fa4..6e6e1ed 100644 --- a/ddtrace_graphql/__init__.py +++ b/ddtrace_graphql/__init__.py @@ -16,7 +16,7 @@ """ -from ddtrace.contrib.util import require_modules +from ddtrace.contrib import require_modules required_modules = ['graphql'] diff --git a/ddtrace_graphql/base.py b/ddtrace_graphql/base.py index fa6ba58..ade2596 100644 --- a/ddtrace_graphql/base.py +++ b/ddtrace_graphql/base.py @@ -3,7 +3,7 @@ import ddtrace import graphql -from ddtrace.ext import errors as ddtrace_errors +from ddtrace.constants import ERROR_MSG, ERROR_STACK, ERROR_TYPE from ddtrace_graphql import utils @@ -79,13 +79,13 @@ def traced_graphql_wrapped( ERRORS, utils.format_errors(result.errors)) span.set_tag( - ddtrace_errors.ERROR_STACK, + ERROR_STACK, utils.format_errors_traceback(result.errors)) span.set_tag( - ddtrace_errors.ERROR_MSG, + ERROR_MSG, utils.format_errors_msg(result.errors)) span.set_tag( - ddtrace_errors.ERROR_TYPE, + ERROR_TYPE, utils.format_errors_type(result.errors)) span.error = int(utils.is_server_error( diff --git a/ddtrace_graphql/patch.py b/ddtrace_graphql/patch.py index e7a58de..043488f 100644 --- a/ddtrace_graphql/patch.py +++ b/ddtrace_graphql/patch.py @@ -8,9 +8,8 @@ import os import graphql -import graphql.backend.core import wrapt -from ddtrace.util import unwrap +from ddtrace.internal.utils.wrappers import unwrap from ddtrace_graphql.base import traced_graphql_wrapped