fix issue in opentracing shim causing span to be wrapped unnecessarily (#1776)

Author: alrex

CHANGELOG.md

@@ -29,7 +29,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
   ([#1726](https://github.com/open-telemetry/opentelemetry-python/pull/1726))
 - Added `__contains__` to `opentelementry.trace.span.TraceState`.
   ([#1773](https://github.com/open-telemetry/opentelemetry-python/pull/1773))
-
+- `opentelemetry-opentracing-shim` Fix an issue in the shim where a Span was being wrapped
+  in a NonRecordingSpan when it wasn't necessary.
+  ([#1776](https://github.com/open-telemetry/opentelemetry-python/pull/1776))
 
 ## [1.0.0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.0.0) - 2021-03-26
 ### Added

shim/opentelemetry-opentracing-shim/src/opentelemetry/shim/opentracing_shim/__init__.py

@@ -681,7 +681,11 @@ def inject(self, span_context, format: object, carrier: object):
 
         propagator = get_global_textmap()
 
-        ctx = set_span_in_context(NonRecordingSpan(span_context.unwrap()))
+        span = span_context.unwrap() if span_context else None
+        if isinstance(span, OtelSpanContext):
+            span = NonRecordingSpan(span)
+
+        ctx = set_span_in_context(span)
         propagator.inject(carrier, context=ctx)
 
     def extract(self, format: object, carrier: object):