Fix urllib suppress instrumentation key

open-telemetry · May 31, 2021 · 2d8d41a · 2d8d41a
1 parent c8fbe00
commit 2d8d41a
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/...opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py b/...opentelemetry-instrumentation-urllib/src/opentelemetry/instrumentation/urllib/__init__.py
@@ -46,19 +46,13 @@
 
 from opentelemetry import context
 from opentelemetry.instrumentation.instrumentor import BaseInstrumentor
-<<<<<<< HEAD
-from opentelemetry.instrumentation.urllib.package import _instruments
-from opentelemetry.instrumentation.urllib.version import __version__
-from opentelemetry.instrumentation.utils import http_status_to_status_code
-=======
 from opentelemetry.instrumentation.urllib.version import (  # pylint: disable=no-name-in-module,import-error
     __version__,
 )
 from opentelemetry.instrumentation.utils import (
     _SUPPRESS_INSTRUMENTATION_KEY,
     http_status_to_status_code,
 )
->>>>>>> b864f5eb (Move suppress key to instrumentation package)
 from opentelemetry.propagate import inject
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.trace import SpanKind, get_tracer