From ca4b52bdb64df61e04552e809281344b25df8cae Mon Sep 17 00:00:00 2001 From: Dan Davison Date: Wed, 20 Dec 2023 13:35:54 -0500 Subject: [PATCH] Don't start prometheus exporter server --- workers/python/main.py | 28 +++++++--------------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/workers/python/main.py b/workers/python/main.py index 36e05185..5ee9c58e 100644 --- a/workers/python/main.py +++ b/workers/python/main.py @@ -3,14 +3,10 @@ import logging import os import sys -import threading from typing import List -from urllib.parse import urlparse -from wsgiref.simple_server import make_server -from prometheus_client import make_wsgi_app from pythonjsonlogger import jsonlogger -from temporalio.client import Client, TLSConfig +from temporalio.client import Client from temporalio.runtime import ( LoggingConfig, PrometheusConfig, @@ -18,6 +14,7 @@ TelemetryConfig, TelemetryFilter, ) +from temporalio.service import TLSConfig from temporalio.worker import Worker from activities import delay_activity, noop_activity @@ -125,22 +122,11 @@ async def run(): logger.addHandler(logHandler) logger.setLevel(nameToLevel[args.log_level.upper()]) - # Configure metrics - prometheus = None - if args.prom_listen_address: - prom_addr = urlparse(args.prom_listen_address) - metrics_app = make_wsgi_app() - handle_path = args.prom_handler_path - - def prom_app(environ, start_fn): - if environ["PATH_INFO"] == handle_path: - return metrics_app(environ, start_fn) - - httpd = make_server(prom_addr.hostname, prom_addr.port, prom_app) - t = threading.Thread(target=httpd.serve_forever) - t.daemon = True - t.start() - prometheus = PrometheusConfig(bind_address=parser.prom_listen_address) + prometheus = ( + PrometheusConfig(bind_address=args.prom_listen_address) + if args.prom_listen_address + else None + ) new_runtime = Runtime( telemetry=TelemetryConfig(