Metrics instrumentation flask

CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - `opentelemetry-instrumentation-redis` add support to instrument RedisCluster clients
   ([#1177](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1177))
+- Add metric instumentation for flask
+  ([#1186](https://github.com/open-telemetry/opentelemetry-python-contrib/pull/1186))
 
 ## [1.12.0rc2-0.32b0](https://github.com/open-telemetry/opentelemetry-python/releases/tag/v1.12.0rc2-0.32b0) - 2022-07-01
 

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

@@ -141,6 +141,7 @@ def response_hook(span: Span, status: str, response_headers: List):
 """
 
 from logging import getLogger
+from timeit import default_timer
 from typing import Collection
 
 import flask
@@ -154,8 +155,8 @@ def response_hook(span: Span, status: str, response_headers: List):
     get_global_response_propagator,
 )
 from opentelemetry.instrumentation.utils import _start_internal_or_server_span
+from opentelemetry.metrics import get_meter
 from opentelemetry.semconv.trace import SpanAttributes
-from opentelemetry.util._time import _time_ns
 from opentelemetry.util.http import get_excluded_urls, parse_excluded_urls
 
 _logger = getLogger(__name__)
@@ -164,7 +165,7 @@ def response_hook(span: Span, status: str, response_headers: List):
 _ENVIRON_SPAN_KEY = "opentelemetry-flask.span_key"
 _ENVIRON_ACTIVATION_KEY = "opentelemetry-flask.activation_key"
 _ENVIRON_TOKEN = "opentelemetry-flask.token"
-
+_ENVIRON_STATUS_CODE_KEY = "opentelemetry-flask.status_code"
 
 _excluded_urls_from_env = get_excluded_urls("FLASK")
 
@@ -184,7 +185,7 @@ def _wrapped_app(wrapped_app_environ, start_response):
         # In theory, we could start the span here and use
         # update_name later but that API is "highly discouraged" so
         # we better avoid it.
-        wrapped_app_environ[_ENVIRON_STARTTIME_KEY] = _time_ns()
+        wrapped_app_environ[_ENVIRON_STARTTIME_KEY] = default_timer()
 
         def _start_response(status, response_headers, *args, **kwargs):
             if flask.request and (
@@ -204,6 +205,11 @@ def _start_response(status, response_headers, *args, **kwargs):
                     otel_wsgi.add_response_attributes(
                         span, status, response_headers
                     )
+                    status_code = otel_wsgi.parse_status_code(status)
+                    if status_code is not None:
+                        flask.request.environ[
+                            _ENVIRON_STATUS_CODE_KEY
+                        ] = status_code
                     if (
                         span.is_recording()
                         and span.kind == trace.SpanKind.SERVER
@@ -229,7 +235,10 @@ def _start_response(status, response_headers, *args, **kwargs):
 
 
 def _wrapped_before_request(
-    request_hook=None, tracer=None, excluded_urls=None
+    active_requests_counter,
+    request_hook=None,
+    tracer=None,
+    excluded_urls=None,
 ):
     def _before_request():
         if excluded_urls and excluded_urls.url_disabled(flask.request.url):
@@ -252,6 +261,10 @@ def _before_request():
             attributes = otel_wsgi.collect_request_attributes(
                 flask_request_environ
             )
+            active_requests_count_attrs = (
+                otel_wsgi.parse_active_request_count_attrs(attributes)
+            )
+            active_requests_counter.add(1, active_requests_count_attrs)
             if flask.request.url_rule:
                 # For 404 that result from no route found, etc, we
                 # don't have a url_rule.
@@ -278,7 +291,11 @@ def _before_request():
     return _before_request
 
 
-def _wrapped_teardown_request(excluded_urls=None):
+def _wrapped_teardown_request(
+    active_requests_counter,
+    duration_histogram,
+    excluded_urls=None,
+):
     def _teardown_request(exc):
         # pylint: disable=E1101
         if excluded_urls and excluded_urls.url_disabled(flask.request.url):
@@ -290,7 +307,21 @@ def _teardown_request(exc):
             # a way that doesn't run `before_request`, like when it is created
             # with `app.test_request_context`.
             return
+        start = flask.request.environ.get(_ENVIRON_STARTTIME_KEY)
+        duration = max(round((default_timer() - start) * 1000), 0)
+        attributes = otel_wsgi.collect_request_attributes(
+            flask.request.environ
+        )
+        active_requests_count_attrs = (
+            otel_wsgi.parse_active_request_count_attrs(attributes)
+        )
+        duration_attrs = otel_wsgi.parse_duration_attrs(attributes)
+        status_code = flask.request.environ.get(_ENVIRON_STATUS_CODE_KEY, None)
+        if status_code:
+            duration_attrs[SpanAttributes.HTTP_STATUS_CODE] = status_code
 
+        duration_histogram.record(duration, duration_attrs)
+        active_requests_counter.add(-1, active_requests_count_attrs)
         if exc is None:
             activation.__exit__(None, None, None)
         else:
@@ -310,6 +341,7 @@ class _InstrumentedFlask(flask.Flask):
     _tracer_provider = None
     _request_hook = None
     _response_hook = None
+    _meter_provider = None
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
@@ -327,7 +359,22 @@ def __init__(self, *args, **kwargs):
             __name__, __version__, _InstrumentedFlask._tracer_provider
         )
 
+        meter = get_meter(
+            __name__, __version__, _InstrumentedFlask._meter_provider
+        )
+        duration_histogram = meter.create_histogram(
+            name="http.server.duration",
+            unit="ms",
+            description="measures the duration of the inbound HTTP request",
+        )
+        active_requests_counter = meter.create_up_down_counter(
+            name="http.server.active_requests",
+            unit="requests",
+            description="measures the number of concurrent HTTP requests that are currently in-flight",
+        )
+
         _before_request = _wrapped_before_request(
+            active_requests_counter,
             _InstrumentedFlask._request_hook,
             tracer,
             excluded_urls=_InstrumentedFlask._excluded_urls,
@@ -336,6 +383,8 @@ def __init__(self, *args, **kwargs):
         self.before_request(_before_request)
 
         _teardown_request = _wrapped_teardown_request(
+            active_requests_counter,
+            duration_histogram,
             excluded_urls=_InstrumentedFlask._excluded_urls,
         )
         self.teardown_request(_teardown_request)
@@ -367,6 +416,8 @@ def _instrument(self, **kwargs):
             if excluded_urls is None
             else parse_excluded_urls(excluded_urls)
         )
+        meter_provider = kwargs.get("meter_provider")
+        _InstrumentedFlask._meter_provider = meter_provider
         flask.Flask = _InstrumentedFlask
 
     def _uninstrument(self, **kwargs):
@@ -379,6 +430,7 @@ def instrument_app(
         response_hook=None,
         tracer_provider=None,
         excluded_urls=None,
+        meter_provider=None,
     ):
         if not hasattr(app, "_is_instrumented_by_opentelemetry"):
             app._is_instrumented_by_opentelemetry = False
@@ -395,8 +447,20 @@ def instrument_app(
             )
 
             tracer = trace.get_tracer(__name__, __version__, tracer_provider)
+            meter = get_meter(__name__, __version__, meter_provider)
+            duration_histogram = meter.create_histogram(
+                name="http.server.duration",
+                unit="ms",
+                description="measures the duration of the inbound HTTP request",
+            )
+            active_requests_counter = meter.create_up_down_counter(
+                name="http.server.active_requests",
+                unit="requests",
+                description="measures the number of concurrent HTTP requests that are currently in-flight",
+            )
 
             _before_request = _wrapped_before_request(
+                active_requests_counter,
                 request_hook,
                 tracer,
                 excluded_urls=excluded_urls,
@@ -405,6 +469,8 @@ def instrument_app(
             app.before_request(_before_request)
 
             _teardown_request = _wrapped_teardown_request(
+                active_requests_counter,
+                duration_histogram,
                 excluded_urls=excluded_urls,
             )
             app._teardown_request = _teardown_request

instrumentation/opentelemetry-instrumentation-flask/tests/test_programmatic.py

@@ -23,7 +23,15 @@
     get_global_response_propagator,
     set_global_response_propagator,
 )
-from opentelemetry.instrumentation.wsgi import OpenTelemetryMiddleware
+from opentelemetry.instrumentation.wsgi import (
+    OpenTelemetryMiddleware,
+    _active_requests_count_attrs,
+    _duration_attrs,
+)
+from opentelemetry.sdk.metrics.export import (
+    HistogramDataPoint,
+    NumberDataPoint,
+)
 from opentelemetry.sdk.resources import Resource
 from opentelemetry.semconv.trace import SpanAttributes
 from opentelemetry.test.wsgitestutil import WsgiTestBase
@@ -49,6 +57,16 @@ def expected_attributes(override_attributes):
     return default_attributes
 
 
+_expected_metric_names = [
+    "http.server.active_requests",
+    "http.server.duration",
+]
+_recommended_attrs = {
+    "http.server.active_requests": _active_requests_count_attrs,
+    "http.server.duration": _duration_attrs,
+}
+
+
 class TestProgrammatic(InstrumentationTest, WsgiTestBase):
     def setUp(self):
         super().setUp()
@@ -250,6 +268,34 @@ def test_exclude_lists_from_explicit(self):
         span_list = self.memory_exporter.get_finished_spans()
         self.assertEqual(len(span_list), 1)
 
+    def test_wsgi_metrics(self):
+        self.client.get("/hello/123")
+        self.client.get("/hello/321")
+        self.client.get("/hello/756")
+        metrics_list = self.memory_metrics_reader.get_metrics_data()
+        number_data_point_seen = False
+        histogram_data_point_seen = False
+        self.assertTrue(len(metrics_list.resource_metrics) != 0)
+        for resource_metric in metrics_list.resource_metrics:
+            self.assertTrue(len(resource_metric.scope_metrics) != 0)
+            for scope_metric in resource_metric.scope_metrics:
+                self.assertTrue(len(scope_metric.metrics) != 0)
+                for metric in scope_metric.metrics:
+                    self.assertIn(metric.name, _expected_metric_names)
+                    data_points = list(metric.data.data_points)
+                    self.assertEqual(len(data_points), 1)
+                    for point in data_points:
+                        if isinstance(point, HistogramDataPoint):
+                            self.assertEqual(point.count, 3)
+                            histogram_data_point_seen = True
+                        if isinstance(point, NumberDataPoint):
+                            number_data_point_seen = True
+                        for attr in point.attributes:
+                            self.assertIn(
+                                attr, _recommended_attrs[metric.name]
+                            )
+        self.assertTrue(number_data_point_seen and histogram_data_point_seen)
+
 
 class TestProgrammaticHooks(InstrumentationTest, WsgiTestBase):
     def setUp(self):

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

@@ -326,14 +326,30 @@ def collect_custom_response_headers_attributes(response_headers):
     return attributes
 
 
-def _parse_status_code(resp_status):
+def parse_status_code(resp_status):
     status_code, _ = resp_status.split(" ", 1)
     try:
         return int(status_code)
     except ValueError:
         return None
 
 
+def parse_active_request_count_attrs(req_attrs):
+    active_requests_count_attrs = {}
+    for attr_key in _active_requests_count_attrs:
+        if req_attrs.get(attr_key) is not None:
+            active_requests_count_attrs[attr_key] = req_attrs[attr_key]
+    return active_requests_count_attrs
+
+
+def parse_duration_attrs(req_attrs):
+    duration_attrs = {}
+    for attr_key in _duration_attrs:
+        if req_attrs.get(attr_key) is not None:
+            duration_attrs[attr_key] = req_attrs[attr_key]
+    return duration_attrs
+
+
 def add_response_attributes(
     span, start_response_status, response_headers
 ):  # pylint: disable=unused-argument
@@ -412,7 +428,7 @@ def _create_start_response(
         @functools.wraps(start_response)
         def _start_response(status, response_headers, *args, **kwargs):
             add_response_attributes(span, status, response_headers)
-            status_code = _parse_status_code(status)
+            status_code = parse_status_code(status)
             if status_code is not None:
                 duration_attrs[SpanAttributes.HTTP_STATUS_CODE] = status_code
             if span.is_recording() and span.kind == trace.SpanKind.SERVER:
@@ -436,15 +452,10 @@ def __call__(self, environ, start_response):
             start_response: The WSGI start_response callable.
         """
         req_attrs = collect_request_attributes(environ)
-        active_requests_count_attrs = {}
-        for attr_key in _active_requests_count_attrs:
-            if req_attrs.get(attr_key) is not None:
-                active_requests_count_attrs[attr_key] = req_attrs[attr_key]
-
-        duration_attrs = {}
-        for attr_key in _duration_attrs:
-            if req_attrs.get(attr_key) is not None:
-                duration_attrs[attr_key] = req_attrs[attr_key]
+        active_requests_count_attrs = parse_active_request_count_attrs(
+            req_attrs
+        )
+        duration_attrs = parse_duration_attrs(req_attrs)
 
         span, token = _start_internal_or_server_span(
             tracer=self.tracer,