Add remaining fixes

Fixes open-telemetry#242

Author: ocelotl

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

@@ -327,7 +327,7 @@ class ScopeShim(opentracing.Scope):
     def __init__(self, manager, span, span_cm=None):
         super().__init__(manager, span)
         self._span_cm = span_cm
-        self._token = attach(set_value("scope_shim", self))
+        attach(set_value("scope_shim", self))
 
     # TODO: Change type of `manager` argument to `opentracing.ScopeManager`? We
     # need to get rid of `manager.tracer` for this.
@@ -395,8 +395,6 @@ def close(self):
         else:
             self._span.unwrap().end()
 
-        detach(self._token)
-
 
 class ScopeManagerShim(opentracing.ScopeManager):
     """Implements :class:`opentracing.ScopeManager` by setting and getting the

instrumentation/opentelemetry-instrumentation-opentracing-shim/tests/test_shim.py

@@ -532,8 +532,6 @@ def test_extract_empty_context_returns_invalid_context(self):
         try:
             carrier = {}
 
-            from ipdb import set_trace
-            set_trace()
             ctx = self.shim.extract(opentracing.Format.HTTP_HEADERS, carrier)
             self.assertEqual(ctx.unwrap(), trace.INVALID_SPAN_CONTEXT)
         finally: