Typo and lint fixes

Author: felix-hilden

instrumentation/opentelemetry-instrumentation-asgi/tests/test_asgi_middleware.py

@@ -321,33 +321,36 @@ def _assert_exemplars_present(
     ):
         metrics_list = self.memory_metrics_reader.get_metrics_data()
         print(metrics_list)
-        found = {name: 0 for name in metric_names}
+        metrics = []
         for resource_metric in (
             getattr(metrics_list, "resource_metrics", []) or []
         ):
             for scope_metric in (
                 getattr(resource_metric, "scope_metrics", []) or []
             ):
-                for metric in getattr(scope_metric, "metrics", []) or []:
-                    if metric.name not in metric_names:
-                        continue
-                    for point in metric.data.data_points:
-                        found[metric.name] += 1
-                        exemplars = getattr(point, "exemplars", None)
-                        self.assertIsNotNone(
-                            exemplars,
-                            msg=f"Expected exemplars list attribute on histogram data point for {metric.name} ({context})",
-                        )
-                        self.assertGreater(
-                            len(exemplars or []),
-                            0,
-                            msg=f"Expected at least one exemplar on histogram data point for {metric.name} ({context}) but none found.",
-                        )
-                        for ex in exemplars or []:
-                            if hasattr(ex, "span_id"):
-                                self.assertNotEqual(ex.span_id, 0)
-                            if hasattr(ex, "trace_id"):
-                                self.assertNotEqual(ex.trace_id, 0)
+                metrics.extend(getattr(scope_metric, "metrics", []) or [])
+
+        found = {name: 0 for name in metric_names}
+        for metric in metrics:
+            if metric.name not in metric_names:
+                continue
+            for point in metric.data.data_points:
+                found[metric.name] += 1
+                exemplars = getattr(point, "exemplars", None)
+                self.assertIsNotNone(
+                    exemplars,
+                    msg=f"Expected exemplars list attribute on histogram data point for {metric.name} ({context})",
+                )
+                self.assertGreater(
+                    len(exemplars or []),
+                    0,
+                    msg=f"Expected at least one exemplar on histogram data point for {metric.name} ({context}) but none found.",
+                )
+                for ex in exemplars or []:
+                    if hasattr(ex, "span_id"):
+                        self.assertNotEqual(ex.span_id, 0)
+                    if hasattr(ex, "trace_id"):
+                        self.assertNotEqual(ex.trace_id, 0)
         for name, count in found.items():
             self.assertGreater(
                 count,

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

@@ -654,6 +654,7 @@ def _start_response(
         return _start_response
 
     # pylint: disable=too-many-branches
+    # pylint: disable=too-many-locals
     def __call__(
         self, environ: WSGIEnvironment, start_response: StartResponse
     ):
@@ -705,13 +706,16 @@ def __call__(
                     self._sem_conv_opt_in_mode,
                 )
                 iterable = self.wsgi(environ, start_response)
-                return _iterate_and_close_with_span(iterable, span, token)
+                return _end_span_after_iterating(iterable, span, token)
         except Exception as ex:
             if _report_new(self._sem_conv_opt_in_mode):
                 req_attrs[ERROR_TYPE] = type(ex).__qualname__
                 if span.is_recording():
                     span.set_attribute(ERROR_TYPE, type(ex).__qualname__)
                 span.set_status(Status(StatusCode.ERROR, str(ex)))
+            span.end()
+            if token is not None:
+                context.detach(token)
             raise
         finally:
             duration_s = default_timer() - start
@@ -735,16 +739,13 @@ def __call__(
                     context=active_metric_ctx,
                 )
             self.active_requests_counter.add(-1, active_requests_count_attrs)
-            span.end()
-            if token is not None:
-                context.detach(token)
 
 
 # Put this in a subfunction to not delay the call to the wrapped
 # WSGI application (instrumentation should change the application
 # behavior as little as possible).
-def _iterate_and_close_with_span(
-    iterable: Iterable[T], span: trace.Span
+def _end_span_after_iterating(
+    iterable: Iterable[T], span: trace.Span, token: object
 ) -> Iterable[T]:
     try:
         with trace.use_span(span):
@@ -753,6 +754,9 @@ def _iterate_and_close_with_span(
         close = getattr(iterable, "close", None)
         if close:
             close()
+        span.end()
+        if token is not None:
+            context.detach(token)
 
 
 # TODO: inherit from opentelemetry.instrumentation.propagators.Setter