fix imports

Author: f-kanari

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/__init__.py

@@ -182,17 +182,19 @@ def client_response_hook(span, future):
 from opentelemetry.metrics import get_meter
 from opentelemetry.metrics._internal.instrument import Histogram
 from opentelemetry.propagators import textmap
-from opentelemetry.semconv.metrics import MetricInstruments
-from opentelemetry.semconv.trace import (
+from opentelemetry.semconv._incubating.attributes.http_attributes import (
     HTTP_CLIENT_IP,
     HTTP_FLAVOR,
     HTTP_HOST,
     HTTP_METHOD,
     HTTP_SCHEME,
     HTTP_STATUS_CODE,
     HTTP_TARGET,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
     NET_PEER_IP,
 )
+from opentelemetry.semconv.metrics import MetricInstruments
 from opentelemetry.trace.status import Status, StatusCode
 from opentelemetry.util.http import (
     OTEL_INSTRUMENTATION_HTTP_CAPTURE_HEADERS_SERVER_REQUEST,

instrumentation/opentelemetry-instrumentation-tornado/src/opentelemetry/instrumentation/tornado/client.py

@@ -20,7 +20,7 @@
 from opentelemetry import trace
 from opentelemetry.instrumentation.utils import http_status_to_status_code
 from opentelemetry.propagate import inject
-from opentelemetry.semconv.trace import (
+from opentelemetry.semconv._incubating.attributes.http_attributes import (
     HTTP_METHOD,
     HTTP_STATUS_CODE,
     HTTP_URL,

instrumentation/opentelemetry-instrumentation-tornado/tests/test_instrumentation.py

@@ -30,14 +30,16 @@
     patch_handler_class,
     unpatch_handler_class,
 )
-from opentelemetry.semconv.trace import (
+from opentelemetry.semconv._incubating.attributes.http_attributes import (
     HTTP_CLIENT_IP,
     HTTP_HOST,
     HTTP_METHOD,
     HTTP_SCHEME,
     HTTP_STATUS_CODE,
     HTTP_TARGET,
     HTTP_URL,
+)
+from opentelemetry.semconv._incubating.attributes.net_attributes import (
     NET_PEER_IP,
 )
 from opentelemetry.test.test_base import TestBase