Merge pull request #64 from zalando/metrics

Add UWSGI metrics collector

connexion/decorators/metrics.py

@@ -0,0 +1,33 @@
+
+import functools
+
+try:
+    import uwsgi_metrics
+    HAS_UWSGI_METRICS = True
+except:
+    HAS_UWSGI_METRICS = False
+
+
+class UWSGIMetricsCollector:
+    def __init__(self, path, method):
+        self.path = path
+        self.method = method
+        self.key = '{}.{}'.format(self.path.strip('/').replace('/', '.').replace('<', '{').replace('>', '}'),
+                                  self.method.upper())
+
+    @staticmethod
+    def is_available():
+        return HAS_UWSGI_METRICS
+
+    def __call__(self, function):
+        """
+        :type function: types.FunctionType
+        :rtype: types.FunctionType
+        """
+
+        @functools.wraps(function)
+        def wrapper(*args, **kwargs):
+            with uwsgi_metrics.timing('connexion.response', self.key):
+                return function(*args, **kwargs)
+
+        return wrapper

connexion/operation.py

@@ -13,10 +13,12 @@
 
 import functools
 import logging
+import os
 
 from .decorators.produces import BaseSerializer, Produces, Jsonifier
 from .decorators.security import security_passthrough, verify_oauth
 from .decorators.validation import RequestBodyValidator, ParameterValidator
+from .decorators.metrics import UWSGIMetricsCollector
 from .exceptions import InvalidSpecification
 from .utils import flaskify_endpoint, get_function_from_name, produces_json
 
@@ -151,6 +153,10 @@ def function(self):
         logger.debug('... Adding security decorator (%r)', security_decorator, extra=vars(self))
         function = security_decorator(function)
 
+        if UWSGIMetricsCollector.is_available():
+            decorator = UWSGIMetricsCollector(self.path, self.method)
+            function = decorator(function)
+
         return function
 
     @property
@@ -227,7 +233,7 @@ def __security_decorator(self):
             scheme_name, scopes = next(iter(security.items()))  # type: str, list
             security_definition = self.security_definitions[scheme_name]
             if security_definition['type'] == 'oauth2':
-                token_info_url = security_definition.get('x-tokenInfoUrl')
+                token_info_url = security_definition.get('x-tokenInfoUrl', os.getenv('HTTP_TOKENINFO_URL'))
                 if token_info_url:
                     scopes = set(scopes)  # convert scopes to set because this is needed for verify_oauth
                     return functools.partial(verify_oauth, token_info_url, scopes)