From 7fcdf314feea2924b8ed1881af59fa825f86046f Mon Sep 17 00:00:00 2001 From: Brian Brazil Date: Fri, 5 Oct 2018 17:28:01 +0100 Subject: [PATCH] Fix import of openmetrics, and make accept handling more general. Signed-off-by: Brian Brazil --- prometheus_client/exposition.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/prometheus_client/exposition.py b/prometheus_client/exposition.py index 0cb41cc7..e9672341 100644 --- a/prometheus_client/exposition.py +++ b/prometheus_client/exposition.py @@ -11,7 +11,7 @@ from wsgiref.simple_server import make_server, WSGIRequestHandler from prometheus_client import core -from prometheus_client import openmetrics +from prometheus_client.openmetrics import exposition as openmetrics try: from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer from SocketServer import ThreadingMixIn @@ -124,9 +124,9 @@ def sample_line(s): def choose_encoder(accept_header): accept_header = accept_header or '' for accepted in accept_header.split(','): - if accepted == 'application/openmetrics-text; version=0.0.1': - return (openmetrics.exposition.generate_latest, - openmetrics.exposition.CONTENT_TYPE_LATEST) + if accepted.split(';')[0].strip() == 'application/openmetrics-text': + return (openmetrics.generate_latest, + openmetrics.CONTENT_TYPE_LATEST) return (generate_latest, CONTENT_TYPE_LATEST)