8000 Fix import of openmetrics, and make accept handling more general. (#318) · danarwix/client_python@9021384 · GitHub
  • [go: up one dir, main page]
    Skip to content

    Commit 9021384

    Browse files
    brian-brazilbrian-brazil
    authored
    Fix import of openmetrics, and make accept handling more general. (prometheus#318)
    Signed-off-by: Brian Brazil <brian.brazil@robustperception.io>
    1 parent d2c0d3e commit 9021384

    File tree

    1 file changed

    +4
    -4
    lines changed

    1 file changed

    +4
    -4
    lines changed

    ‎prometheus_client/exposition.py

    Lines changed: 4 additions & 4 deletions
    Original file line numberDiff line numberDiff line change
    @@ -11,7 +11,7 @@
    1111
    from wsgiref.simple_server import make_server, WSGIRequestHandler
    1212

    1313
    from prometheus_client import core
    14-
    from prometheus_client import openmetrics
    14+
    from prometheus_client.openmetrics import exposition as openmetrics
    1515
    try:
    1616
    from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
    1717
    from SocketServer import ThreadingMixIn
    @@ -124,9 +124,9 @@ def sample_line(s):
    124124
    def choose_encoder(accept_header):
    125125
    accept_header = accept_header or ''
    126126
    for accepted in accept_header.split(','):
    127-
    if accepted == 'application/openmetrics-text; version=0.0.1':
    128-
    return (openmetrics.exposition.generate_latest,
    129-
    openmetrics.exposition.CONTENT_TYPE_LATEST)
    127+
    if accepted.split(';')[0].strip() == 'application/openmetrics-text':
    128+
    return (openmetrics.generate_latest,
    129+
    openmetrics.CONTENT_TYPE_LATEST)
    130130
    return (generate_latest, CONTENT_TYPE_LATEST)
    131131

    132132

    0 commit comments

    Comments
     (0)
    0