Aleksei.lesieur/opentelemetry

.github/workflows/python-package.yaml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.8, 3.9]
 
     container:
       image: python:${{ matrix.python-version }}

.pre-commit-config.yaml

@@ -5,19 +5,19 @@ repos:
     name: make-fmt
     stages: [commit]
     language: system
-    entry: docker-compose run baseplate make fmt
+    entry: docker compose run --no-TTY baseplate make fmt
     always_run: true
   - id: make-lint
     name: make-lint
     stages: [push]
     language: system
-    entry: docker-compose run baseplate make lint
+    entry: docker compose run --no-TTY baseplate make lint
     always_run: true
     fail_fast: true
   - id: pytest
     name: pytest
     stages: [push]
     language: system
-    entry: docker-compose run baseplate pytest
+    entry: docker compose run --no-TTY baseplate pytest
     always_run: true
     fail_fast: true

Dockerfile

@@ -12,6 +12,7 @@ WORKDIR /src
 ENV CASS_DRIVER_NO_EXTENSIONS theytaketoolongtobuild
 
 COPY requirements*.txt ./
+RUN apt-get -y update && apt-get -y install librdkafka-dev && rm -rf /var/lib/apt/lists/*
 RUN pip install -r requirements.txt
 
 RUN touch /baseplate-py-dev-docker-image

baseplate/clients/requests.py

@@ -10,6 +10,7 @@
 
 from advocate import AddrValidator
 from advocate import ValidatingHTTPAdapter
+from opentelemetry.instrumentation.requests import RequestsInstrumentor
 from prometheus_client import Counter
 from prometheus_client import Gauge
 from prometheus_client import Histogram
@@ -26,6 +27,9 @@
 from baseplate.lib.prometheus_metrics import getHTTPSuccessLabel
 
 
+RequestsInstrumentor().instrument()
+
+
 def http_adapter_from_config(
     app_config: config.RawConfig, prefix: str, **kwargs: Any
 ) -> HTTPAdapter:

baseplate/frameworks/pyramid/__init__.py

@@ -16,6 +16,8 @@
 import pyramid.tweens
 import webob.request
 
+from opentelemetry import trace
+from opentelemetry.instrumentation.pyramid import PyramidInstrumentor
 from prometheus_client import Counter
 from prometheus_client import Gauge
 from prometheus_client import Histogram
@@ -35,10 +37,12 @@
 from baseplate.thrift.ttypes import IsHealthyProbe
 
 
+PyramidInstrumentor().instrument()
+
 logger = logging.getLogger(__name__)
 
 
-class SpanFinishingAppIterWrapper:
+class SpanFinishingAppIterWrapper(Iterable):
     """Wrapper for Response.app_iter that finishes the span when the iterator is done.
 
     The WSGI spec expects applications to return an iterable object. In the
@@ -53,7 +57,7 @@ class SpanFinishingAppIterWrapper:
 
     """
 
-    def __init__(self, span: Span, app_iter: Iterable[bytes]) -> None:
+    def __init__(self, app_iter: Iterator[bytes], span: Optional[Span] = None) -> None:
         self.span = span
         self.app_iter = iter(app_iter)
 
@@ -64,10 +68,15 @@ def __next__(self) -> bytes:
         try:
             return next(self.app_iter)
         except StopIteration:
-            self.span.finish()
+            trace.get_current_span().set_status(trace.status.StatusCode.OK)
+            if self.span:
+                self.span.finish()
             raise
-        except:  # noqa: E722
-            self.span.finish(exc_info=sys.exc_info())
+        except Exception as e:  # noqa: E722
+            trace.get_current_span().set_status(trace.status.StatusCode.ERROR)
+            trace.get_current_span().record_exception(e)
+            if self.span:
+                self.span.finish(exc_info=sys.exc_info())
             raise
 
     def close(self) -> None:
@@ -129,15 +138,21 @@ def baseplate_tween(request: Request) -> Response:
             response = handler(request)
             if request.span:
                 request.span.set_tag("http.response_length", response.content_length)
-        except:  # noqa: E722
+        except Exception as e:  # noqa: E722
+            trace.get_current_span().set_status(trace.status.StatusCode.ERROR)
+            trace.get_current_span().record_exception(e)
             if hasattr(request, "span") and request.span:
                 request.span.finish(exc_info=sys.exc_info())
             raise
         else:
+            trace.get_current_span().set_status(trace.status.StatusCode.OK)
+            content_length = response.content_length
             if request.span:
                 request.span.set_tag("http.status_code", response.status_code)
-                content_length = response.content_length
-                response.app_iter = SpanFinishingAppIterWrapper(request.span, response.app_iter)
+                response.app_iter = SpanFinishingAppIterWrapper(response.app_iter, request.span)
+                response.content_length = content_length
+            else:
+                response.app_iter = SpanFinishingAppIterWrapper(response.app_iter)
                 response.content_length = content_length
         finally:
             manually_close_request_metrics(request, response)